From d1518f06afabec75b535119e737406b7622f3f93 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Fri, 27 Sep 2024 12:59:06 -0700 Subject: [PATCH] Added latest timing data --- .../combined/merges_analyzer_histograms.pdf | Bin 213435 -> 213435 bytes .../combined/merges_timed/47deg/firebrand.csv | 4 ++-- .../9apps/elasticsearch-cloudwatch.csv | 4 ++-- .../merges_timed/ab0oo/javaprslib.csv | 4 ++-- .../combined/merges_timed/abel533/echarts.csv | 4 ++-- .../merges_timed/acciente/oacc-core.csv | 4 ++-- .../merges_timed/accla/d4m_api_java.csv | 4 ++-- results/combined/merges_timed/adamd/z.csv | 4 ++-- results/combined/merges_timed/adangel/pmd.csv | 4 ++-- .../combined/merges_timed/addthis/meshy.csv | 4 ++-- .../merges_timed/addthis/stream-lib.csv | 4 ++-- .../merges_timed/adoptopenjdk/mjprof.csv | 4 ++-- .../aerogear/aerogear-crypto-java.csv | 4 ++-- .../aerospike/aerospike-client-java.csv | 4 ++-- .../afranken/jmeter-analysis-maven-plugin.csv | 4 ++-- .../merges_timed/ahmetaa/zemberek-nlp.csv | 4 ++-- .../merges_timed/ahome-it/lienzo-core.csv | 4 ++-- .../aleksandr-m/gitflow-maven-plugin.csv | 4 ++-- .../kickstart-springjerseyhibernate.csv | 4 ++-- .../elasticsearch-maven-plugin.csv | 4 ++-- .../merges_timed/alexruiz/fest-util.csv | 4 ++-- .../merges_timed/alexxiyang/shiro-redis.csv | 4 ++-- .../combined/merges_timed/alibaba/canal.csv | 4 ++-- .../merges_timed/alibaba/easyexcel.csv | 4 ++-- .../allan-huang/remote-procedure-call.csv | 4 ++-- .../allanbank/mongodb-async-driver.csv | 4 ++-- .../merges_timed/amplafi/htmlcleaner.csv | 4 ++-- ...ringboot-angular-atmosphere-quickstart.csv | 4 ++-- .../andresoviedo/google-drive-ftp-adapter.csv | 4 ++-- .../andrewphorn/classicube-client.csv | 4 ++-- .../merges_timed/andygibson/datafactory.csv | 4 ++-- results/combined/merges_timed/anjuke/hwi.csv | 4 ++-- .../merges_timed/antlr/grammars-v4.csv | 4 ++-- .../combined/merges_timed/apache/accumulo.csv | 4 ++-- results/combined/merges_timed/apache/avro.csv | 4 ++-- .../combined/merges_timed/apache/cayenne.csv | 4 ++-- .../merges_timed/apache/commons-bcel.csv | 4 ++-- .../merges_timed/apache/commons-beanutils.csv | 4 ++-- .../merges_timed/apache/commons-codec.csv | 4 ++-- .../apache/commons-collections.csv | 4 ++-- .../merges_timed/apache/commons-csv.csv | 4 ++-- .../merges_timed/apache/commons-dbcp.csv | 4 ++-- .../merges_timed/apache/commons-email.csv | 4 ++-- .../apache/commons-fileupload.csv | 4 ++-- .../merges_timed/apache/commons-imaging.csv | 4 ++-- .../merges_timed/apache/commons-io.csv | 4 ++-- .../merges_timed/apache/commons-jexl.csv | 4 ++-- .../merges_timed/apache/commons-lang.csv | 4 ++-- .../merges_timed/apache/commons-math.csv | 4 ++-- .../merges_timed/apache/commons-net.csv | 4 ++-- .../merges_timed/apache/commons-ognl.csv | 4 ++-- .../merges_timed/apache/commons-pool.csv | 4 ++-- .../merges_timed/apache/commons-validator.csv | 4 ++-- .../merges_timed/apache/directory-kerby.csv | 4 ++-- results/combined/merges_timed/apache/fop.csv | 4 ++-- .../merges_timed/apache/geronimo-specs.csv | 4 ++-- .../merges_timed/apache/incubator-tamaya.csv | 4 ++-- .../apache/jackrabbit-filevault.csv | 4 ++-- .../merges_timed/apache/jackrabbit.csv | 4 ++-- .../merges_timed/apache/james-mime4j.csv | 4 ++-- .../merges_timed/apache/maven-enforcer.csv | 4 ++-- .../apache/maven-plugin-tools.csv | 4 ++-- .../merges_timed/apache/metamodel.csv | 4 ++-- .../merges_timed/apache/olingo-odata2.csv | 4 ++-- .../merges_timed/apache/olingo-odata4.csv | 4 ++-- .../combined/merges_timed/apache/opennlp.csv | 4 ++-- .../combined/merges_timed/apache/roller.csv | 4 ++-- .../combined/merges_timed/apache/shiro.csv | 4 ++-- .../apache/tomcat-maven-plugin.csv | 4 ++-- .../merges_timed/appendium/flatpack.csv | 4 ++-- .../merges_timed/appstatus/appstatus.csv | 4 ++-- .../arcbees/arcbees-archetypes.csv | 4 ++-- .../merges_timed/arcbees/gwtchosen.csv | 4 ++-- .../arcbees/universal-analytics.csv | 4 ++-- .../selenium-standalone-server-plugin.csv | 4 ++-- .../merges_timed/arimus/jmimemagic.csv | 4 ++-- results/combined/merges_timed/arnim/hdp.csv | 4 ++-- .../kafka-http-metrics-reporter.csv | 4 ++-- .../arquillian/arquillian-container-jetty.csv | 4 ++-- .../merges_timed/arturmkrtchyan/iban4j.csv | 4 ++-- .../merges_timed/asciidoctor/asciidoclet.csv | 4 ++-- .../merges_timed/aseldawy/spatialhadoop2.csv | 4 ++-- .../merges_timed/astefanutti/metrics-cdi.csv | 4 ++-- .../merges_timed/astrapi69/jaulp.wicket.csv | 4 ++-- .../combined/merges_timed/ata4/disunity.csv | 4 ++-- .../combined/merges_timed/atam4j/atam4j.csv | 4 ++-- .../combined/merges_timed/athou/commafeed.csv | 4 ++-- .../atmosphere/atmosphere-extensions.csv | 4 ++-- .../merges_timed/atorstling/bychan.csv | 4 ++-- .../merges_timed/attoparser/attoparser.csv | 4 ++-- .../merges_timed/augustt198/lumen.csv | 4 ++-- .../aurbroszniowski/rainfall-core.csv | 4 ++-- .../combined/merges_timed/auth0/java-jwt.csv | 4 ++-- .../avaje-common/avaje-agentloader.csv | 4 ++-- .../merges_timed/awaisathar/dependensee.csv | 4 ++-- .../merges_timed/awaitility/awaitility.csv | 4 ++-- .../aweber/rabbitmq-flume-plugin.csv | 4 ++-- .../aws/aws-cloudtrail-processing-library.csv | 4 ++-- .../awslabs/amazon-kinesis-client.csv | 4 ++-- .../awslabs/amazon-sqs-java-messaging-lib.csv | 4 ++-- .../merges_timed/awslabs/dynamodb-geo.csv | 4 ++-- .../awslabs/kinesis-log4j-appender.csv | 4 ++-- ...azure-activedirectory-library-for-java.csv | 4 ++-- .../merges_timed/b/kafka-websocket.csv | 4 ++-- .../merges_timed/barend/java-iban.csv | 4 ++-- .../merges_timed/basho/riak-java-client.csv | 4 ++-- .../merges_timed/bastillion-io/bastillion.csv | 4 ++-- .../merges_timed/bazhenov/load-test-tool.csv | 4 ++-- .../merges_timed/beastmachine/ggplot.csv | 4 ++-- .../bedatadriven/jackson-datatype-jts.csv | 4 ++-- .../merges_timed/benas/easy-rules.csv | 4 ++-- .../combined/merges_timed/benas/projector.csv | 4 ++-- .../merges_timed/benoker/dockingframes.csv | 4 ++-- .../combined/merges_timed/bguerout/jongo.csv | 4 ++-- .../biezhi/30-seconds-of-java8.csv | 4 ++-- .../merges_timed/bitletorg/weupnp.csv | 4 ++-- .../merges_timed/bitzeche/zencoder-java.csv | 4 ++-- .../bjornharrtell/jts2geojson.csv | 4 ++-- .../blockchain/api-v1-client-java.csv | 4 ++-- .../bluebreezecf/sparkjobserverclient.csv | 4 ++-- .../merges_timed/bobharner/componentworld.csv | 4 ++-- results/combined/merges_timed/boilit/ebm.csv | 4 ++-- .../merges_timed/brettflan/worldborder.csv | 4 ++-- .../brettwooldridge/hikarijson.csv | 4 ++-- .../brettwooldridge/nuprocess.csv | 4 ++-- .../merges_timed/brettwooldridge/sansorm.csv | 4 ++-- .../brettwooldridge/sparsebitset.csv | 4 ++-- .../brewinapps/ios-maven-plugin.csv | 4 ++-- .../merges_timed/brianm/config-magic.csv | 4 ++-- .../combined/merges_timed/brianm/jdbi3.csv | 4 ++-- .../really-executable-jars-maven-plugin.csv | 4 ++-- .../merges_timed/brndnmtthws/hdfs.csv | 4 ++-- .../broadleafcommerce/broadleafcommerce.csv | 4 ++-- .../merges_timed/bronx/saci-vraptor.csv | 4 ++-- .../brooklyncentral/brooklyn-ambari.csv | 4 ++-- .../merges_timed/brooklyncentral/clocker.csv | 4 ++-- .../merges_timed/brunoribeiro/sql-parser.csv | 4 ++-- .../merges_timed/bryncooke/cdi-unit.csv | 4 ++-- .../merges_timed/bsblabs/embed-for-vaadin.csv | 4 ++-- .../combined/merges_timed/bserdar/jcliff.csv | 4 ++-- .../merges_timed/btrplace/scheduler.csv | 4 ++-- .../buddycloud/buddycloud-server-java.csv | 4 ++-- .../merges_timed/bujiio/buji-pac4j.csv | 4 ++-- .../buschmais/extended-objects.csv | 4 ++-- .../merges_timed/bytedeco/javacpp.csv | 4 ++-- .../merges_timed/caelum/vraptor-console.csv | 4 ++-- .../caelum/vraptor-environment.csv | 4 ++-- .../merges_timed/campagnelaboratory/metar.csv | 4 ++-- .../camsys/onebusaway-application-modules.csv | 4 ++-- .../camunda/camunda-archetypes.csv | 4 ++-- .../camunda/camunda-bpm-mockito.csv | 4 ++-- .../merges_timed/carbonado/carbonado.csv | 4 ++-- .../merges_timed/carlossg/glacier-cli.csv | 4 ++-- .../merges_timed/cdi-spec/cdi-tck.csv | 4 ++-- results/combined/merges_timed/cglib/cglib.csv | 4 ++-- .../merges_timed/chargebee/chargebee-java.csv | 4 ++-- .../combined/merges_timed/chat-wane/lseq.csv | 4 ++-- .../merges_timed/chrisvest/stormpot.csv | 4 ++-- .../merges_timed/chrsan/css-selectors.csv | 4 ++-- .../cinovo/cloudconductor-server.csv | 4 ++-- .../merges_timed/circuitsoftgroup/slackmc.csv | 4 ++-- .../merges_timed/citysearch/web-widgets.csv | 4 ++-- .../citytechinc/cq-component-maven-plugin.csv | 4 ++-- .../merges_timed/cjwizard/cjwizard.csv | 4 ++-- .../combined/merges_timed/clickntap/vimeo.csv | 4 ++-- .../combined/merges_timed/clojure/clojure.csv | 4 ++-- .../cloudfoundry/cf-java-client.csv | 4 ++-- .../merges_timed/cloudslab/cloudsim.csv | 4 ++-- .../merges_timed/cloudslang/score.csv | 4 ++-- .../clusterbench/clusterbench.csv | 4 ++-- .../merges_timed/code4craft/termblog.csv | 4 ++-- .../merges_timed/code4craft/webmagic.csv | 4 ++-- .../codecentric/jmeter-graph-maven-plugin.csv | 4 ++-- .../merges_timed/codedance/silken.csv | 4 ++-- .../merges_timed/codeine-cd/codeine.csv | 4 ++-- .../codelibs/elasticsearch-dataformat.csv | 4 ++-- .../codelibs/elasticsearch-dynarank.csv | 4 ++-- .../codelibs/elasticsearch-reindexing.csv | 4 ++-- .../codingpedia/demo-rest-jersey-spring.csv | 4 ++-- .../cognifide/sling-dynamic-include.csv | 4 ++-- .../cognitect-labs/transducers-java.csv | 4 ++-- .../merges_timed/cognitect/transit-java.csv | 4 ++-- .../comatoes/ftl-profile-editor.csv | 4 ++-- .../combined/merges_timed/comcast/jrugged.csv | 4 ++-- .../merges_timed/commons-rdf/commons-rdf.csv | 4 ++-- .../merges_timed/connorlinfoot/cratesplus.csv | 4 ++-- .../merges_timed/conveyal/osm-lib.csv | 4 ++-- .../merges_timed/corentin59/artnetstack.csv | 4 ++-- .../combined/merges_timed/corfudb/corfudb.csv | 4 ++-- .../merges_timed/couchbase/couchbasemock.csv | 4 ++-- .../merges_timed/coutume/imageonmap.csv | 4 ++-- .../coverity/coverity-security-library.csv | 4 ++-- .../cowtowncoder/java-classmate.csv | 4 ++-- .../cowtowncoder/java-merge-sort.csv | 4 ++-- .../cowtowncoder/java-uuid-generator.csv | 4 ++-- .../merges_timed/craigwblake/redline.csv | 4 ++-- .../merges_timed/creswick/cjwizard.csv | 4 ++-- .../java-mandrill-wrapper.csv | 4 ++-- .../merges_timed/cternes/openkeepass.csv | 4 ++-- .../merges_timed/ctran/tinyradius.csv | 4 ++-- .../merges_timed/dabsquared/gitlab-plugin.csv | 4 ++-- .../combined/merges_timed/dakusui/jcunit.csv | 4 ++-- .../danielflower/maven-gitlog-plugin.csv | 4 ++-- .../merges_timed/danielgronau/highj.csv | 4 ++-- .../danielnorberg/auto-matter.csv | 4 ++-- .../merges_timed/dankurka/gwtphonegap.csv | 4 ++-- .../combined/merges_timed/dankurka/mgwt.csv | 4 ++-- .../merges_timed/darcy-framework/darcy-ui.csv | 4 ++-- .../datanucleus/datanucleus-core.csv | 4 ++-- .../datanucleus/datanucleus-rdbms.csv | 4 ++-- .../merges_timed/datasift/datasift-java.csv | 4 ++-- .../merges_timed/datastax/java-driver.csv | 4 ++-- .../datumbox/datumbox-framework.csv | 4 ++-- .../davidb/scala-maven-plugin.csv | 4 ++-- .../combined/merges_timed/davidmoten/geo.csv | 4 ++-- .../merges_timed/davidmoten/rtree.csv | 4 ++-- .../merges_timed/davidmoten/rxjava-extras.csv | 4 ++-- .../merges_timed/davidmoten/rxjava-file.csv | 4 ++-- .../merges_timed/davidmoten/rxjava-jdbc.csv | 4 ++-- .../merges_timed/davidmoten/rxjava-slf4j.csv | 4 ++-- .../combined/merges_timed/dbaeli/conf4j.csv | 4 ++-- .../combined/merges_timed/dbaeli/ez18n.csv | 4 ++-- .../dblock/jenkins-ansicolor-plugin.csv | 4 ++-- results/combined/merges_timed/dblock/oshi.csv | 4 ++-- .../combined/merges_timed/dcm4che/dcm4che.csv | 4 ++-- .../merges_timed/deathmarine/luyten.csv | 4 ++-- .../combined/merges_timed/deemopen/zkui.csv | 4 ++-- .../merges_timed/dennisjzh/gwtmobile-ui.csv | 4 ++-- .../merges_timed/dfabulich/sitemapgen4j.csv | 4 ++-- .../combined/merges_timed/dgarijo/widoco.csv | 4 ++-- .../merges_timed/dgradecak/alfresco-mvc.csv | 4 ++-- .../merges_timed/dieselpoint/norm.csv | 4 ++-- .../digidotcom/xbeejavalibrary.csv | 4 ++-- .../digital-preservation/droid.csv | 4 ++-- .../combined/merges_timed/dius/java-faker.csv | 4 ++-- .../merges_timed/dkunzler/esperandro.csv | 4 ++-- .../merges_timed/docopt/docopt.java.csv | 4 ++-- .../merges_timed/doctau/garbagecat.csv | 4 ++-- .../merges_timed/documents4j/documents4j.csv | 4 ++-- .../merges_timed/douglasrodrigo/bfmapper.csv | 4 ++-- .../merges_timed/dozedoff/similarimage.csv | 4 ++-- .../driesschulten/dozer-model.csv | 4 ++-- .../droolsjbpm/droolsjbpm-knowledge.csv | 4 ++-- .../dropwizard/dropwizard-elasticsearch.csv | 4 ++-- .../dropwizard/dropwizard-flyway.csv | 4 ++-- .../merges_timed/druid-io/druid-api.csv | 4 ++-- .../merges_timed/dschulten/hydra-java.csv | 4 ++-- .../combined/merges_timed/dspace/dspace.csv | 4 ++-- .../dtrott/maven-protoc-plugin.csv | 4 ++-- .../combined/merges_timed/dtrules/dtrules.csv | 4 ++-- .../duesenklipper/wicket-safemodel.csv | 4 ++-- .../combined/merges_timed/dvcama/lodview.csv | 4 ++-- .../dvdme/forecastio-lib-java.csv | 4 ++-- .../combined/merges_timed/dwslab/dwslib.csv | 4 ++-- results/combined/merges_timed/dynjs/dynjs.csv | 4 ++-- .../combined/merges_timed/e-mzungu/rjc.csv | 4 ++-- .../merges_timed/eaftan/hprof-parser.csv | 4 ++-- .../merges_timed/easetech/easytest-core.csv | 4 ++-- .../combined/merges_timed/ebay/xcelite.csv | 4 ++-- .../merges_timed/edwardcapriolo/nibiru.csv | 4 ++-- .../egineering-llc/collectd-fast-jmx.csv | 4 ++-- .../combined/merges_timed/ehcache/sizeof.csv | 4 ++-- .../einsamhauer/disthene-reader.csv | 4 ++-- .../merges_timed/einsamhauer/disthene.csv | 4 ++-- .../eirslett/frontend-maven-plugin.csv | 4 ++-- .../combined/merges_timed/ekryd/sortpom.csv | 4 ++-- .../ekt/biblio-transformation-engine.csv | 4 ++-- .../elasticjob/elastic-job-lite.csv | 4 ++-- .../java-vector-tile.csv | 4 ++-- .../merges_timed/elisarver/selophane.csv | 4 ++-- .../combined/merges_timed/elunez/eladmin.csv | 4 ++-- .../merges_timed/emicklei/rendersnake.csv | 4 ++-- .../engine-alpha/engine-alpha.csv | 4 ++-- .../vertx-elasticsearch-service.csv | 4 ++-- .../merges_timed/entertailion/fling.csv | 4 ++-- .../combined/merges_timed/erudika/para.csv | 4 ++-- .../merges_timed/esapi/esapi-java-legacy.csv | 4 ++-- .../combined/merges_timed/eskatos/asadmin.csv | 4 ++-- .../merges_timed/esotericsoftware/kryo.csv | 4 ++-- .../combined/merges_timed/evil-co/nbt-lib.csv | 4 ++-- .../merges_timed/evolute-pt/dbtransfer.csv | 4 ++-- .../merges_timed/facebook/jcommon.csv | 4 ++-- .../merges_timed/farin/jcloisterzone.csv | 4 ++-- .../combined/merges_timed/fasseg/exp4j.csv | 4 ++-- .../merges_timed/fasterxml/aalto-xml.csv | 4 ++-- .../fasterxml/jackson-annotations.csv | 4 ++-- .../merges_timed/fasterxml/jackson-core.csv | 4 ++-- .../fasterxml/jackson-dataformat-avro.csv | 4 ++-- .../fasterxml/jackson-dataformat-cbor.csv | 4 ++-- .../fasterxml/jackson-dataformat-xml.csv | 4 ++-- .../fasterxml/jackson-datatype-guava.csv | 4 ++-- .../fasterxml/jackson-datatype-hibernate.csv | 4 ++-- .../fasterxml/jackson-datatype-joda.csv | 4 ++-- .../fasterxml/jackson-datatype-jsr310.csv | 4 ++-- .../fasterxml/jackson-module-afterburner.csv | 4 ++-- .../jackson-module-jaxb-annotations.csv | 4 ++-- .../fasterxml/jackson-module-mrbean.csv | 4 ++-- results/combined/merges_timed/feedzai/pdb.csv | 4 ++-- .../fenixedu/fenixedu-academic.csv | 4 ++-- .../fernandezpablo85/scribe-java.csv | 4 ++-- .../combined/merges_timed/feroult/yawp.csv | 4 ++-- .../merges_timed/feuyeux/jax-rs2-atup.csv | 4 ++-- .../fex-team/fis-velocity-tools.csv | 4 ++-- .../combined/merges_timed/ffay/lanproxy.csv | 4 ++-- .../combined/merges_timed/fiji/trackmate.csv | 4 ++-- .../fiji/trainable_segmentation.csv | 4 ++-- .../combined/merges_timed/fincatto/nfe.csv | 4 ++-- .../combined/merges_timed/findwise/hydra.csv | 4 ++-- .../merges_timed/finraos/jtaf-xcore.csv | 4 ++-- .../fit2cloud/qingcloud-api-java-wrapper.csv | 4 ++-- .../merges_timed/flaptor/indextank-java.csv | 4 ++-- .../merges_timed/flaxsearch/luwak.csv | 4 ++-- .../flipkart-incubator/zjsonpatch.csv | 4 ++-- .../fluentlenium/fluentlenium.csv | 4 ++-- .../flyingsaucerproject/flyingsaucer.csv | 4 ++-- .../merges_timed/fmcarvalho/htmlflow.csv | 4 ++-- .../fommil/matrix-toolkits-java.csv | 4 ++-- .../analytics-cloud-dataset-utils.csv | 4 ++-- .../merges_timed/forcedotcom/sitecrawler.csv | 4 ++-- .../combined/merges_timed/forcedotcom/wsc.csv | 4 ++-- .../merges_timed/fordfrog/apgdiff.csv | 4 ++-- .../merges_timed/frankbille/scoreboard.csv | 4 ++-- .../freehep/freehep-vectorgraphics.csv | 4 ++-- .../merges_timed/frizbog/gedcom4j.csv | 4 ++-- .../merges_timed/fusesource/hawtjni.csv | 4 ++-- .../merges_timed/fusesource/jansi-native.csv | 4 ++-- .../merges_timed/fusesource/jansi.csv | 4 ++-- .../merges_timed/galenframework/galen.csv | 4 ++-- .../merges_timed/garbagemule/mobarena.csv | 4 ++-- .../merges_timed/gatein/gatein-api-java.csv | 4 ++-- .../merges_timed/gbif/name-parser.csv | 4 ++-- .../geisbruch/hadoopcryptocompressor.csv | 4 ++-- .../merges_timed/geoffreywiseman/moo.csv | 4 ++-- .../geosolutions-it/geoserver-manager.csv | 4 ++-- results/combined/merges_timed/gephi/gephi.csv | 4 ++-- .../merges_timed/getbridge/bridge-java.csv | 4 ++-- .../merges_timed/ghillairet/emfjson.csv | 4 ++-- .../combined/merges_timed/giltene/jhiccup.csv | 4 ++-- .../merges_timed/gini/dropwizard-gelf.csv | 4 ++-- .../combined/merges_timed/gitools/gitools.csv | 4 ++-- .../merges_timed/giusepperizzo/nerd4java.csv | 4 ++-- .../merges_timed/glamdring/aardwark.csv | 4 ++-- .../merges_timed/glenkpeterson/fp4java7.csv | 4 ++-- .../merges_timed/glenkpeterson/j-cicle.csv | 4 ++-- .../merges_timed/glenkpeterson/j-sicle.csv | 4 ++-- .../merges_timed/glowroot/glowroot.csv | 4 ++-- .../merges_timed/gooddata/gooddata-cl.csv | 4 ++-- .../google/closure-stylesheets.csv | 4 ++-- .../merges_timed/google/compile-testing.csv | 4 ++-- .../merges_timed/google/error-prone.csv | 4 ++-- .../google/google-java-format.csv | 4 ++-- .../combined/merges_timed/google/guice.csv | 4 ++-- .../merges_timed/google/gwtmockito.csv | 4 ++-- .../google/identity-toolkit-java-client.csv | 4 ++-- .../combined/merges_timed/google/truth.csv | 4 ++-- .../googlecloudplatform/gcloud-java.csv | 4 ++-- .../gcloud-maven-plugin.csv | 4 ++-- .../merges_timed/gpedro/slack-webhook.csv | 4 ++-- .../graphaware/neo4j-noderank.csv | 4 ++-- .../merges_timed/graphity/graphity-client.csv | 4 ++-- .../graylog2/graylog2-alarmcallback-slack.csv | 4 ++-- .../merges_timed/greenlaw110/rythm.csv | 4 ++-- .../greenmail-mail-test/greenmail.csv | 4 ++-- .../merges_timed/greese/dasein-cloud-core.csv | 4 ++-- .../merges_timed/gridgain/yardstick.csv | 4 ++-- .../combined/merges_timed/grove/presto.csv | 4 ++-- .../merges_timed/grundid/nfctools.csv | 4 ++-- .../combined/merges_timed/grunka/fortuna.csv | 4 ++-- .../merges_timed/guhilling/cdi-test.csv | 4 ++-- .../gwt-test-utils/gwt-test-utils.csv | 4 ++-- .../gwtbootstrap3/gwtbootstrap3.csv | 4 ++-- .../hansolo/steelseries-swing.csv | 4 ++-- .../haraldwalker/user-agent-utils.csv | 4 ++-- results/combined/merges_timed/hdiv/hdiv.csv | 4 ++-- .../hdrhistogram/hdrhistogram.csv | 4 ++-- .../helpscout/helpscout-api-java.csv | 4 ++-- .../combined/merges_timed/helun/ektorp.csv | 4 ++-- .../heroku/devcenter-embedded-tomcat.csv | 4 ++-- .../heroku/heroku-maven-plugin.csv | 4 ++-- .../heroku/java-getting-started.csv | 4 ++-- .../combined/merges_timed/heronarts/lx.csv | 4 ++-- .../hmsonline/storm-cassandra-cql.csv | 4 ++-- .../combined/merges_timed/hoijui/javaosc.csv | 4 ++-- results/combined/merges_timed/hoijui/jawk.csv | 4 ++-- .../merges_timed/hoten/java-delaunay.csv | 4 ++-- .../merges_timed/hoverruan/weiboclient4j.csv | 4 ++-- .../merges_timed/httpcache4j/httpcache4j.csv | 4 ++-- .../merges_timed/huaban/jieba-analysis.csv | 4 ++-- .../merges_timed/hudec/sql-processor.csv | 4 ++-- .../merges_timed/hyphen-ated/djbot.csv | 4 ++-- .../combined/merges_timed/icoloma/tldgen.csv | 4 ++-- .../combined/merges_timed/idpf/epubcheck.csv | 4 ++-- .../idris-hackers/idris-java-rts.csv | 4 ++-- .../merges_timed/igniterealtime/tinder.csv | 4 ++-- .../ignorance77/transformiceapi.csv | 4 ++-- .../merges_timed/iipc/webarchive-commons.csv | 4 ++-- .../merges_timed/imagej/imagej-ops.csv | 4 ++-- .../combined/merges_timed/imglib/imglib2.csv | 4 ++-- .../merges_timed/imixs/imixs-workflow.csv | 4 ++-- .../immobilienscout24/deadcode4j.csv | 4 ++-- .../khs-spring-batch-report-writer.csv | 4 ++-- .../merges_timed/inaiat/jqplot4java.csv | 4 ++-- .../ingenieux/awseb-deployment-plugin.csv | 4 ++-- .../combined/merges_timed/intcode/sweetie.csv | 4 ++-- .../ipeirotis/get-another-label.csv | 4 ++-- .../irobertson/jpa-annotation-processor.csv | 4 ++-- results/combined/merges_timed/irstv/cts.csv | 4 ++-- .../combined/merges_timed/iryndin/jdbf.csv | 4 ++-- .../iterate-ch/java-openstack-swift.csv | 4 ++-- .../merges_timed/j-easy/easy-rules.csv | 4 ++-- .../merges_timed/j256/ormlite-core.csv | 4 ++-- .../merges_timed/j256/simplemagic.csv | 4 ++-- .../jacquesberger/jsonparsingexample.csv | 4 ++-- .../merges_timed/jadler-mocking/jadler.csv | 4 ++-- .../merges_timed/jahia/jahiapp-newsletter.csv | 4 ++-- .../merges_timed/jahia/ldap-provider.csv | 4 ++-- .../jai-imageio/jai-imageio-jpeg2000.csv | 4 ++-- .../merges_timed/jakewharton/disklrucache.csv | 4 ++-- .../merges_timed/jalkanen/speed4j.csv | 4 ++-- .../merges_timed/japgolly/svg-android.csv | 4 ++-- .../merges_timed/jasig/java-cas-client.csv | 4 ++-- .../merges_timed/jasig/jspc-maven-plugin.csv | 4 ++-- .../merges_timed/jasig/webproxyportlet.csv | 4 ++-- .../merges_timed/javamoney/jsr354-api.csv | 4 ++-- .../merges_timed/javamoney/jsr354-ri.csv | 4 ++-- .../merges_timed/javaparser/javaparser.csv | 4 ++-- .../combined/merges_timed/javasoze/clue.csv | 4 ++-- .../combined/merges_timed/javen205/ijpay.csv | 4 ++-- .../merges_timed/jayway/awaitility.csv | 4 ++-- .../jboss-logging/jboss-logging-tools.csv | 4 ++-- .../jboss-modules/jboss-modules.csv | 4 ++-- .../merges_timed/jboss-msc/jboss-msc.csv | 4 ++-- .../jboss-remoting/jboss-remoting.csv | 4 ++-- .../jboss/jboss-jacc-api_spec.csv | 4 ++-- .../merges_timed/jbossas/jboss-dmr.csv | 4 ++-- .../merges_timed/jbossas/remoting-jmx.csv | 4 ++-- .../merges_timed/jbossas/staxmapper.csv | 4 ++-- .../merges_timed/jcabi/jcabi-aspects.csv | 4 ++-- .../merges_timed/jcabi/jcabi-dynamo.csv | 4 ++-- .../jcabi/jcabi-dynamodb-maven-plugin.csv | 4 ++-- .../merges_timed/jcabi/jcabi-github.csv | 4 ++-- .../merges_timed/jcabi/jcabi-http.csv | 4 ++-- .../merges_timed/jcabi/jcabi-jdbc.csv | 4 ++-- .../merges_timed/jcabi/jcabi-manifests.csv | 4 ++-- .../combined/merges_timed/jcabi/jcabi-w3c.csv | 4 ++-- .../merges_timed/jclawson/hazeltask.csv | 4 ++-- .../merges_timed/jdatepicker/jdatepicker.csv | 4 ++-- .../merges_timed/jdeparser/jdeparser2.csv | 4 ++-- .../combined/merges_timed/jdkcn/jabberer.csv | 4 ++-- .../combined/merges_timed/jdupl/lancoder.csv | 4 ++-- .../jeevatkm/digitalocean-api-java.csv | 4 ++-- .../jeluard/maven-plantuml-plugin.csv | 4 ++-- .../jeluard/semantic-versioning.csv | 4 ++-- .../merges_timed/jenkins-infra/ircbot.csv | 4 ++-- .../jenkinsci/active-directory-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/ant-plugin.csv | 4 ++-- .../jenkinsci/backend-update-center2.csv | 4 ++-- .../jenkinsci/bitbucket-plugin.csv | 4 ++-- .../jenkinsci/build-timeout-plugin.csv | 4 ++-- .../jenkinsci/configurationslicing-plugin.csv | 4 ++-- .../jenkinsci/copyartifact-plugin.csv | 4 ++-- .../jenkinsci/coverity-plugin.csv | 4 ++-- .../jenkinsci/credentials-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/deploy-plugin.csv | 4 ++-- .../jenkinsci/disk-usage-plugin.csv | 4 ++-- .../jenkinsci/docker-build-publish-plugin.csv | 4 ++-- .../jenkinsci/email-ext-plugin.csv | 4 ++-- .../embeddable-build-status-plugin.csv | 4 ++-- .../jenkinsci/google-oauth-plugin.csv | 4 ++-- .../jenkinsci/instant-messaging-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/jira-plugin.csv | 4 ++-- .../jenkinsci/jobconfighistory-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/junit-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/ldap-plugin.csv | 4 ++-- .../jenkinsci/log-parser-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/mailer-plugin.csv | 4 ++-- .../jenkinsci/maven-hpi-plugin.csv | 4 ++-- .../jenkinsci/mercurial-plugin.csv | 4 ++-- .../jenkinsci/nested-view-plugin.csv | 4 ++-- .../jenkinsci/oki-docki-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/plot-plugin.csv | 4 ++-- .../jenkinsci/promoted-builds-plugin.csv | 4 ++-- .../merges_timed/jenkinsci/rebuild-plugin.csv | 4 ++-- .../jenkinsci/ruby-runtime-plugin.csv | 4 ++-- .../jenkinsci/ssh-slaves-plugin.csv | 4 ++-- .../jenkinsci/testng-plugin-plugin.csv | 4 ++-- .../throttle-concurrent-builds-plugin.csv | 4 ++-- .../jenkinsci/token-macro-plugin.csv | 4 ++-- .../jenkinsci/ui-samples-plugin.csv | 4 ++-- .../jenkinsci/urltrigger-plugin.csv | 4 ++-- .../jenkinsci/vsphere-cloud-plugin.csv | 4 ++-- .../windows-azure-storage-plugin.csv | 4 ++-- .../combined/merges_timed/jexp/jpatterns.csv | 4 ++-- .../merges_timed/jexp/neo4j-rdbms-import.csv | 4 ++-- .../combined/merges_timed/jfaster/mango.csv | 4 ++-- .../combined/merges_timed/jfinal/jfinal.csv | 4 ++-- .../jfrogdev/teamcity-artifactory-plugin.csv | 4 ++-- .../combined/merges_timed/jgralab/jgralab.csv | 4 ++-- .../combined/merges_timed/jgrapht/jgrapht.csv | 4 ++-- .../jhalterman/concurrentunit.csv | 4 ++-- .../merges_timed/jhalterman/expiringmap.csv | 4 ++-- .../merges_timed/jhalterman/failsafe.csv | 4 ++-- .../combined/merges_timed/jiaqi/jmxterm.csv | 4 ++-- .../combined/merges_timed/jinahya/bit-io.csv | 4 ++-- .../combined/merges_timed/jingwei/krati.csv | 4 ++-- .../merges_timed/jitsi/dnssecjava.csv | 4 ++-- .../merges_timed/jkotlinski/lsdpatch.csv | 4 ++-- .../combined/merges_timed/jline/jline2.csv | 4 ++-- .../jlinn/quartz-redis-jobstore.csv | 4 ++-- .../merges_timed/jmacglashan/burlap.csv | 4 ++-- .../combined/merges_timed/jmetal/jmetal.csv | 4 ++-- .../jmeter-maven-plugin.csv | 4 ++-- .../merges_timed/jmrozanec/cron-utils.csv | 4 ++-- .../merges_timed/jmurty/java-xmlbuilder.csv | 4 ++-- .../jmxtrans/embedded-jmxtrans.csv | 4 ++-- .../merges_timed/jmxtrans/jmxtrans-agent.csv | 4 ++-- .../jnasmartcardio/jnasmartcardio.csv | 4 ++-- .../combined/merges_timed/jnr/jnr-enxio.csv | 4 ++-- .../merges_timed/jnr/jnr-unixsocket.csv | 4 ++-- .../joaoarthurbm/designwizard.csv | 4 ++-- .../merges_timed/jodaorg/joda-beans.csv | 4 ++-- .../jodastephen/property-alliance.csv | 4 ++-- .../assertj-assertions-generator.csv | 4 ++-- .../joel-costigliola/assertj-core.csv | 4 ++-- .../joelittlejohn/embedmongo-maven-plugin.csv | 4 ++-- .../merges_timed/johncarl81/parceler.csv | 4 ++-- .../merges_timed/johnnei/javatorrent.csv | 4 ++-- results/combined/merges_timed/jooq/jooq.csv | 4 ++-- .../joschi/dropwizard-elasticsearch.csv | 4 ++-- .../merges_timed/joschi/dropwizard-flyway.csv | 4 ++-- .../merges_timed/joshlong/spring-birt.csv | 4 ++-- .../merges_timed/joyent/java-manta.csv | 4 ++-- .../combined/merges_timed/jparsec/jparsec.csv | 4 ++-- .../merges_timed/jpmml/openscoring.csv | 4 ++-- .../jprante/elasticsearch-csv.csv | 4 ++-- .../combined/merges_timed/jqm4gwt/jqm4gwt.csv | 4 ++-- .../merges_timed/jqno/equalsverifier.csv | 4 ++-- .../spring-comparing-template-engines.csv | 4 ++-- .../combined/merges_timed/jri/deepamehta.csv | 4 ++-- .../combined/merges_timed/jruby/bytelist.csv | 4 ++-- .../merges_timed/jruby/jruby-parser.csv | 4 ++-- .../jsamoocha/linksalienceclassification.csv | 4 ++-- .../merges_timed/jsevellec/cassandra-unit.csv | 4 ++-- .../merges_timed/jsimone/webapp-runner.csv | 4 ++-- .../combined/merges_timed/jsprit/jsprit.csv | 4 ++-- .../merges_timed/jtablesaw/tablesaw.csv | 4 ++-- .../merges_timed/julianhyde/linq4j.csv | 4 ++-- .../merges_timed/julianhyde/sqlline.csv | 4 ++-- .../merges_timed/julietkilo/canbabel.csv | 4 ++-- .../merges_timed/juniper/netconf-java.csv | 4 ++-- .../merges_timed/junit-team/junit.csv | 4 ++-- .../merges_timed/junit-team/junit4.csv | 4 ++-- .../jutzig/github-release-plugin.csv | 4 ++-- .../merges_timed/jvirtanen/nassau.csv | 4 ++-- .../merges_timed/jvirtanen/parity.csv | 4 ++-- .../jvm-profiling-tools/async-profiler.csv | 4 ++-- .../merges_timed/jwcarman/wicketopia.csv | 4 ++-- results/combined/merges_timed/jwtk/jjwt.csv | 4 ++-- results/combined/merges_timed/k3po/k3po.csv | 4 ++-- .../combined/merges_timed/kaazing/k3po.csv | 4 ++-- .../combined/merges_timed/kaazing/robot.csv | 4 ++-- .../merges_timed/kamranzafar/jtar.csv | 4 ++-- .../merges_timed/kantega/pdf-converter.csv | 4 ++-- .../kawasima/websocket-classloader.csv | 4 ++-- .../kbnlresearch/europeananp-ner.csv | 4 ++-- .../merges_timed/keedio/flume-ftp-source.csv | 4 ++-- .../keedio/flume-ng-sql-source.csv | 4 ++-- .../merges_timed/kevin-wayne/algs4.csv | 4 ++-- .../combined/merges_timed/kevinbayes/vest.csv | 4 ++-- .../khmarbaise/iterator-maven-plugin.csv | 4 ++-- .../maven-license-verifier-plugin.csv | 4 ++-- .../merges_timed/khuxtable/wagon-gitsite.csv | 4 ++-- .../merges_timed/kifj/jboss-syslog.csv | 4 ++-- .../killbilling/recurly-java-library.csv | 4 ++-- .../merges_timed/killme2008/aviator.csv | 4 ++-- .../merges_timed/killme2008/xmemcached.csv | 4 ++-- .../combined/merges_timed/kimshen/sissi.csv | 4 ++-- .../merges_timed/kinow/testlink-java-api.csv | 4 ++-- .../merges_timed/kohsuke/access-modifier.csv | 4 ++-- .../kohsuke/file-leak-detector.csv | 4 ++-- .../merges_timed/kohsuke/github-api.csv | 4 ++-- .../merges_timed/kohsuke/groovy-sandbox.csv | 4 ++-- .../merges_timed/kohsuke/libpam4j.csv | 4 ++-- .../combined/merges_timed/kohsuke/winp.csv | 4 ++-- .../spring-mvc-quickstart-archetype.csv | 4 ++-- .../komamitsu/jackson-dataformat-msgpack.csv | 4 ++-- .../combined/merges_timed/komoot/photon.csv | 4 ++-- .../merges_timed/kong/unirest-java.csv | 4 ++-- .../kongchen/swagger-maven-plugin.csv | 4 ++-- .../merges_timed/konloch/bytecode-viewer.csv | 4 ++-- .../merges_timed/koraktor/mavanagaiata.csv | 4 ++-- .../koraktor/steam-condenser-java.csv | 4 ++-- .../merges_timed/kpelykh/docker-java.csv | 4 ++-- .../combined/merges_timed/krilivye/jocco.csv | 4 ++-- .../kroimon/bukkit-alphachest.csv | 4 ++-- .../merges_timed/kshchepanovskyi/zkcopy.csv | 4 ++-- .../merges_timed/kstyrc/embedded-redis.csv | 4 ++-- .../merges_timed/kungfoo/geohash-java.csv | 4 ++-- .../merges_timed/kurbatov/firmata4j.csv | 4 ++-- .../merges_timed/kvladislav/ticketmanager.csv | 4 ++-- .../merges_timed/laforge49/jactor.csv | 4 ++-- .../merges_timed/laforge49/jactor2.csv | 4 ++-- results/combined/merges_timed/larsga/duke.csv | 4 ++-- .../lazaromedina/flume-ftp-source.csv | 4 ++-- .../lbehnke/hierarchical-clustering-java.csv | 4 ++-- .../lbroudoux/es-amazon-s3-river.csv | 4 ++-- .../learning-layers/socialsemanticserver.csv | 4 ++-- .../merges_timed/learnlib/learnlib.csv | 4 ++-- .../leeadkins/elasticsearch-redis-river.csv | 4 ++-- .../lemire/externalsortinginjava.csv | 4 ++-- .../combined/merges_timed/lemire/javaewah.csv | 4 ++-- .../leonlee/flume-ng-mongodb-sink.csv | 4 ++-- .../merges_timed/lettuce-io/lettuce-core.csv | 4 ++-- .../leveluplunch/levelup-java-examples.csv | 4 ++-- .../merges_timed/librato/metrics-librato.csv | 4 ++-- .../combined/merges_timed/linkedin/camus.csv | 4 ++-- .../merges_timed/linlinjava/litemall.csv | 4 ++-- .../linsolas/casperjs-runner-maven-plugin.csv | 4 ++-- .../combined/merges_timed/lintool/clueweb.csv | 4 ++-- .../merges_timed/lionsoul2014/jcseg.csv | 4 ++-- .../merges_timed/liyiorg/weixin-popular.csv | 4 ++-- .../logstash/log4j-jsonevent-layout.csv | 4 ++-- .../logstash/logstash-logback-encoder.csv | 4 ++-- .../merges_timed/lookfirst/sardine.csv | 4 ++-- .../merges_timed/lukas-krecan/json2xml.csv | 4 ++-- .../merges_timed/lukas-krecan/jsonunit.csv | 4 ++-- .../lukaszlenart/launch4j-maven-plugin.csv | 4 ++-- .../lukegb/gitdescribe-maven-plugin.csv | 4 ++-- .../merges_timed/lusito/gamedevweek.csv | 4 ++-- .../merges_timed/lwhite1/tablesaw.csv | 4 ++-- .../combined/merges_timed/lyncode/xoai.csv | 4 ++-- .../merges_timed/lyogavin/pistachio.csv | 4 ++-- .../maciejwalkowiak/java-plist-serializer.csv | 4 ++-- .../maciejzaleski/jmeter-websocketsampler.csv | 4 ++-- .../merges_timed/magro/kryo-serializers.csv | 4 ++-- .../merges_timed/mahoney/slf4j-test.csv | 4 ++-- .../mambu-gmbh/mambu-apis-java.csv | 4 ++-- .../merges_timed/mangstadt/ez-vcard.csv | 4 ++-- .../merges_timed/maoo/maven-tiles.csv | 4 ++-- .../marginallyclever/makelangelo.csv | 4 ++-- .../aliendroid-activerecord.csv | 4 ++-- .../marschall/memoryfilesystem.csv | 4 ++-- .../martinpaljak/globalplatformpro.csv | 4 ++-- .../merges_timed/martylamb/nailgun.csv | 4 ++-- .../merges_timed/mashape/unirest-java.csv | 4 ++-- .../masterthought/cucumber-reporting.csv | 4 ++-- .../merges_timed/matthias247/jawampa.csv | 4 ++-- .../mattinsler/com.lowereast.guiceymongo.csv | 4 ++-- .../maven-nar/cpptasks-parallel.csv | 4 ++-- .../maven-nar/nar-maven-plugin.csv | 4 ++-- .../combined/merges_timed/mavocz/smscsim.csv | 4 ++-- .../merges_timed/maxmind/geoip-api-java.csv | 4 ++-- .../merges_timed/mbaechler/proxy-servlet.csv | 4 ++-- .../mbknor/dropwizard-activemq-bundle.csv | 4 ++-- .../maven-java-formatter-plugin.csv | 4 ++-- .../combined/merges_timed/mbosecke/pebble.csv | 4 ++-- .../merges_timed/mboudreau/alternator.csv | 4 ++-- .../combined/merges_timed/mcmmo-dev/mcmmo.csv | 4 ++-- .../merges_timed/mcupak/beacon-of-beacons.csv | 4 ++-- .../combined/merges_timed/mdeanda/lorem.csv | 4 ++-- .../mdeinum/spring-batch-excel.csv | 4 ++-- .../medcl/elasticsearch-analysis-ik.csv | 4 ++-- .../medcl/elasticsearch-analysis-pinyin.csv | 4 ++-- .../elasticsearch-analysis-stconvert.csv | 4 ++-- .../medcl/elasticsearch-partialupdate.csv | 4 ++-- .../merges_timed/mercadopago/sdk-java.csv | 4 ++-- .../merges_timed/metamx/extendedset.csv | 4 ++-- .../merges_timed/meyerjp3/psychometrics.csv | 4 ++-- .../merges_timed/mh4j/metaheuristics4java.csv | 4 ++-- .../merges_timed/michaelwittig/java-q.csv | 4 ++-- .../merges_timed/micromata/javaapiforkml.csv | 4 ++-- .../merges_timed/mikaelhg/openblocks.csv | 4 ++-- .../combined/merges_timed/mikera/vectorz.csv | 4 ++-- .../merges_timed/mikvor/money-conversion.csv | 4 ++-- .../merges_timed/milkbowl/vaultapi.csv | 4 ++-- .../combined/merges_timed/mimno/mallet.csv | 4 ++-- .../merges_timed/minecrafter/bungeejson.csv | 4 ++-- .../merges_timed/mitre/http-proxy-servlet.csv | 4 ++-- .../merges_timed/mixpanel/mixpanel-java.csv | 4 ++-- .../merges_timed/mjsalerno/unobot.csv | 4 ++-- .../combined/merges_timed/mjsax/aeolus.csv | 4 ++-- .../mklemm/jaxb2-rich-contract-plugin.csv | 4 ++-- .../merges_timed/mlaccetti/javapns.csv | 4 ++-- .../merges_timed/mmastrac/nanojson.csv | 4 ++-- results/combined/merges_timed/mmazi/rescu.csv | 4 ++-- .../merges_timed/mmlab/rmlprocessor.csv | 4 ++-- .../mojohaus/exec-maven-plugin.csv | 4 ++-- .../merges_timed/mongobee/mongobee.csv | 4 ++-- .../monitorjbl/excel-streaming-reader.csv | 4 ++-- .../elasticsearch-analysis-morfologik.csv | 4 ++-- .../mooso/azure-tables-hadoop.csv | 4 ++-- .../merges_timed/moquette-io/moquette.csv | 4 ++-- .../morfologik/morfologik-stemming.csv | 4 ++-- .../moritanosuke/glacieruploader.csv | 4 ++-- .../merges_timed/motown-io/motown.csv | 4 ++-- .../combined/merges_timed/movsim/movsim.csv | 4 ++-- .../combined/merges_timed/mpatric/mp3agic.csv | 4 ++-- .../combined/merges_timed/mpusher/mpush.csv | 4 ++-- .../mrcookieslime/slimefun-3.0.csv | 4 ++-- .../merges_timed/mrice/license-check.csv | 4 ++-- .../merges_timed/mrpdaemon/encfs-java.csv | 4 ++-- ...azure-activedirectory-library-for-java.csv | 4 ++-- .../omnituredatafileinputformat.csv | 4 ++-- .../combined/merges_timed/mtedone/podam.csv | 4 ++-- .../combined/merges_timed/mttkay/signpost.csv | 4 ++-- .../combined/merges_timed/mwanji/toml4j.csv | 4 ++-- .../merges_timed/mybatis/jpetstore-6.csv | 4 ++-- .../merges_timed/mybatis/mybatis-3.csv | 4 ++-- .../combined/merges_timed/mybatis/spring.csv | 4 ++-- .../mycila/license-maven-plugin.csv | 4 ++-- .../merges_timed/mygrid/rightfield.csv | 4 ++-- .../mypurecloud/elasticsearch-lambda.csv | 4 ++-- .../n0rad/jstest-maven-plugin.csv | 4 ++-- .../combined/merges_timed/nabedge/mixer2.csv | 4 ++-- .../nabeelmukhtar/github-java-sdk.csv | 4 ++-- .../combined/merges_timed/named-data/jndn.csv | 4 ++-- .../merges_timed/nanohttpd/nanohttpd.csv | 4 ++-- .../combined/merges_timed/nastel/tnt4j.csv | 4 ++-- .../nea/vertx-mod-cassandra-persistor.csv | 4 ++-- .../merges_timed/needle4j/needle4j.csv | 4 ++-- .../merges_timed/nepxion/discovery.csv | 4 ++-- .../stash-jenkins-postreceive-webhook.csv | 4 ++-- .../combined/merges_timed/netflix/rxjava.csv | 4 ++-- .../merges_timed/newbee-ltd/newbee-mall.csv | 4 ++-- .../combined/merges_timed/nhl/link-etl.csv | 4 ++-- .../nicoulaj/checksum-maven-plugin.csv | 4 ++-- .../combined/merges_timed/ning/compress.csv | 4 ++-- .../merges_timed/ninjaframework/ninja.csv | 4 ++-- .../combined/merges_timed/ninjudd/drip.csv | 4 ++-- .../merges_timed/nitnelave/creeperheal.csv | 4 ++-- .../merges_timed/nlpchina/nlp-lang.csv | 4 ++-- .../merges_timed/nmdp-bioinformatics/ngs.csv | 4 ++-- .../merges_timed/northconcepts/event-bus.csv | 4 ++-- .../combined/merges_timed/northlander/a.csv | 4 ++-- .../merges_timed/nuodb/migration-tools.csv | 4 ++-- .../merges_timed/nurkiewicz/async-retry.csv | 4 ++-- .../nurkiewicz/java8-workshop.csv | 4 ++-- .../combined/merges_timed/nutzam/nutzwx.csv | 4 ++-- .../merges_timed/nysenate/openlegislation.csv | 4 ++-- results/combined/merges_timed/oaqa/baseqa.csv | 4 ++-- .../combined/merges_timed/oauth-apis/apis.csv | 4 ++-- .../obourgain/elasticsearch-http.csv | 4 ++-- .../octo-technology/sonar-objective-c.csv | 4 ++-- .../merges_timed/okjsp/okmakeover.csv | 4 ++-- .../combined/merges_timed/okleine/ncoap.csv | 4 ++-- .../merges_timed/oldhu/suunto2nike.csv | 4 ++-- .../oldmanpushcart/greys-anatomy.csv | 4 ++-- .../combined/merges_timed/olibye/guvna.csv | 4 ++-- .../merges_timed/oltpbenchmark/oltpbench.csv | 4 ++-- .../merges_timed/omnifaces/omnifaces.csv | 4 ++-- .../onebusaway-application-modules.csv | 4 ++-- .../onebusaway/onebusaway-gtfs-modules.csv | 4 ++-- .../onebusaway-gtfs-realtime-api.csv | 4 ++-- .../merges_timed/onyxbits/raccoon.csv | 4 ++-- .../openapitools/openapi-generator.csv | 4 ++-- .../opendatalab-de/geojson-jackson.csv | 4 ++-- .../combined/merges_timed/openhab/jmdns.csv | 4 ++-- .../merges_timed/openhft/chronicle-bytes.csv | 4 ++-- .../openhft/chronicle-network.csv | 4 ++-- .../openhft/chronicle-threads.csv | 4 ++-- .../openhft/zero-allocation-hashing.csv | 4 ++-- .../openmicroscopy/bioformats.csv | 4 ++-- .../combined/merges_timed/openpnp/openpnp.csv | 4 ++-- .../merges_timed/openrefine/openrefine.csv | 4 ++-- .../merges_timed/openskynetwork/java-adsb.csv | 4 ++-- .../merges_timed/opentosca/container.csv | 4 ++-- .../merges_timed/openzipkin/zipkin.csv | 4 ++-- .../ops4j/org.ops4j.pax.swissbox.csv | 4 ++-- .../optimaize/language-detector.csv | 4 ++-- .../merges_timed/orctom/was-maven-plugin.csv | 4 ++-- .../merges_timed/orien/bean-matchers.csv | 4 ++-- .../orientechnologies/orientdb-etl.csv | 4 ++-- results/combined/merges_timed/oripa/oripa.csv | 4 ++-- .../merges_timed/oskopek/javaanpr.csv | 4 ++-- .../combined/merges_timed/outbrain/ob1k.csv | 4 ++-- .../merges_timed/overturetool/overture.csv | 4 ++-- .../merges_timed/oxo42/stateless4j.csv | 4 ++-- .../merges_timed/pablissimo/sonartsplugin.csv | 4 ++-- .../pagehelper/mybatis-pagehelper.csv | 4 ++-- .../merges_timed/pandcorps/pandam.csv | 4 ++-- .../cassandra-list-subranges.csv | 4 ++-- .../merges_timed/paulosuzart/jtornado.csv | 4 ++-- .../merges_timed/pax95/camel-ironmq.csv | 4 ++-- .../merges_timed/pedrovgs/algorithms.csv | 4 ++-- .../merges_timed/peterisp/morphology.csv | 4 ++-- .../petitparser/java-petitparser.csv | 4 ++-- .../merges_timed/phaed420/simpleclans.csv | 4 ++-- .../phantomydn/wicket-orientdb.csv | 4 ++-- .../combined/merges_timed/phax/jcodemodel.csv | 4 ++-- .../merges_timed/pholser/jopt-simple.csv | 4 ++-- .../merges_timed/pholser/junit-quickcheck.csv | 4 ++-- .../merges_timed/pires/obd-java-api.csv | 4 ++-- .../merges_timed/plaid/plaid-java.csv | 4 ++-- .../combined/merges_timed/plum-umd/rubah.csv | 4 ++-- .../combined/merges_timed/plutext/docx4j.csv | 4 ++-- results/combined/merges_timed/pmd/pmd.csv | 4 ++-- .../merges_timed/poetix/protonpack.csv | 4 ++-- .../polopoly/jetty-maven-plugin.csv | 4 ++-- .../merges_timed/pragmatists/junitparams.csv | 4 ++-- .../merges_timed/premium-minds/billy.csv | 4 ++-- .../premium-minds/pm-wicket-utils.csv | 4 ++-- .../merges_timed/prism/prism-bukkit.csv | 4 ++-- .../merges_timed/progether/jadventure.csv | 4 ++-- .../projectblueshift/blueshiftapi.csv | 4 ++-- .../merges_timed/projectdanube/xdi2.csv | 4 ++-- .../projectkorra/projectkorra.csv | 4 ++-- .../merges_timed/ptgoetz/storm-hdfs.csv | 4 ++-- .../merges_timed/pydio/pydio-sdk-java.csv | 4 ++-- .../combined/merges_timed/pyknic/codegen.csv | 4 ++-- results/combined/merges_timed/qcadoo/mes.csv | 4 ++-- .../merges_timed/qihoo360/xlearning.csv | 4 ++-- .../merges_timed/qubole/presto-udfs.csv | 4 ++-- .../querydsl/apt-maven-plugin.csv | 4 ++-- .../combined/merges_timed/qunarcorp/qmq.csv | 4 ++-- .../merges_timed/quux00/simplecsv.csv | 4 ++-- .../merges_timed/rackerlabs/blueflood.csv | 4 ++-- .../combined/merges_timed/radkovo/cssbox.csv | 4 ++-- .../merges_timed/radkovo/jstyleparser.csv | 4 ++-- results/combined/merges_timed/radsz/jacop.csv | 4 ++-- .../merges_timed/ralscha/embeddedtc.csv | 4 ++-- .../raml-org/raml-java-parser.csv | 4 ++-- .../merges_timed/rcarz/jira-client.csv | 4 ++-- .../merges_timed/rcongiu/hive-json-serde.csv | 4 ++-- .../merges_timed/rcsb/colorbrewer.csv | 4 ++-- .../combined/merges_timed/rdfhdt/hdt-java.csv | 4 ++-- .../merges_timed/reckart/shib-http-client.csv | 4 ++-- .../merges_timed/recommenders/rival.csv | 4 ++-- .../merges_timed/recruit-tech/redpen.csv | 4 ++-- .../merges_timed/redhogs/cron-parser.csv | 4 ++-- .../redline-smalltalk/redline-smalltalk.csv | 4 ++-- .../merges_timed/redsolution/otr4j.csv | 4 ++-- .../merges_timed/reficio/p2-maven-plugin.csv | 4 ++-- .../merges_timed/reinert/jjschema.csv | 4 ++-- .../merges_timed/relayrides/pushy.csv | 4 ++-- .../pom-manipulation-ext.csv | 4 ++-- .../generalized-language-modeling-toolkit.csv | 4 ++-- .../merges_timed/renggli/java-petitparser.csv | 4 ++-- .../merges_timed/renggli/petitparserjava.csv | 4 ++-- .../merges_timed/resthub/springmvc-router.csv | 4 ++-- .../merges_timed/resty-gwt/resty-gwt.csv | 4 ++-- .../richardwarburton/lambda-behave.csv | 4 ++-- .../merges_timed/risingoak/jenkins-client.csv | 4 ++-- .../merges_timed/rjohnsondev/java-libpst.csv | 4 ++-- .../merges_timed/rncryptor/jncryptor.csv | 4 ++-- .../merges_timed/rnewson/couchdb-lucene.csv | 4 ++-- .../merges_timed/robert-bor/csveed.csv | 4 ++-- .../merges_timed/robobees/simbeeotic.csv | 4 ++-- .../robotframework/javalibcore.csv | 4 ++-- .../merges_timed/robotiumtech/robotium.csv | 4 ++-- .../combined/merges_timed/robrua/orianna.csv | 4 ++-- .../rocketscience-projects/javaslang.csv | 4 ++-- .../combined/merges_timed/rometools/rome.csv | 4 ++-- .../romix/java-concurrent-hash-trie-map.csv | 4 ++-- .../merges_timed/roncoo/roncoo-pay.csv | 4 ++-- .../merges_timed/rschreijer/lutung.csv | 4 ++-- .../rtyley/android-viewholder-listviews.csv | 4 ++-- results/combined/merges_timed/ru/casanova.csv | 4 ++-- .../merges_timed/rubenlagus/telegrambots.csv | 4 ++-- .../ruedigermoeller/kontraktor.csv | 4 ++-- .../merges_timed/runeflobakk/motif.csv | 4 ++-- .../merges_timed/runelite/runelite.csv | 4 ++-- .../ryantenney/metrics-spring.csv | 4 ++-- .../merges_timed/rylinaux/plugman.csv | 4 ++-- .../s4u/pgpverify-maven-plugin.csv | 4 ++-- .../sachin-handiekar/jinstagram.csv | 4 ++-- .../sailthru/sailthru-java-client.csv | 4 ++-- .../salyh/elasticsearch-river-imap.csv | 4 ++-- .../merges_timed/sammthomson/semafor.csv | 4 ++-- .../merges_timed/samskivert/jmustache.csv | 4 ++-- .../merges_timed/samskivert/pythagoras.csv | 4 ++-- .../merges_timed/samskivert/samskivert.csv | 4 ++-- .../merges_timed/sander2798/enderstone.csv | 4 ++-- .../sandergielisse/enderstone.csv | 4 ++-- .../merges_timed/saucelabs/ci-sauce.csv | 4 ++-- .../merges_timed/sbtourist/journal.io.csv | 4 ++-- .../merges_timed/schema-repo/schema-repo.csv | 4 ++-- .../combined/merges_timed/scifio/scifio.csv | 4 ++-- .../merges_timed/scribble/scribble-java.csv | 4 ++-- .../merges_timed/scribejava/scribejava.csv | 4 ++-- .../merges_timed/sd4324530/fastweixin.csv | 4 ++-- .../sdllanguagetechnologies/testy.csv | 4 ++-- results/combined/merges_timed/seam/render.csv | 4 ++-- .../merges_timed/seanchenxi/gwt-storage.csv | 4 ++-- .../merges_timed/sebfz1/wicket-jquery-ui.csv | 4 ++-- .../merges_timed/seedboxer/seedboxer.csv | 4 ++-- .../merges_timed/segmentio/analytics-java.csv | 4 ++-- .../semanticvectors/semanticvectors.csv | 4 ++-- .../merges_timed/sexyideas/moosificator.csv | 4 ++-- .../sgoeschl/jmeter-sla-report.csv | 4 ++-- .../merges_timed/shazam/shazamcrest.csv | 4 ++-- .../shhs-coding-club/drugwars.csv | 4 ++-- .../shimikano/spring-jpa-bulk.csv | 4 ++-- .../shopizer-ecommerce/shopizer.csv | 4 ++-- .../sijpesteijn/mafia-maven-plugin.csv | 4 ++-- .../silverpop/engage-api-client.csv | 4 ++-- .../combined/merges_timed/simasch/qlrm.csv | 4 ++-- .../merges_timed/simmetrics/simmetrics.csv | 4 ++-- .../simpligility/android-ndk-maven-plugin.csv | 4 ++-- .../merges_timed/skyscreamer/jsonassert.csv | 4 ++-- .../merges_timed/skyscreamer/nevado.csv | 4 ++-- .../merges_timed/skyscreamer/yoga.csv | 4 ++-- .../merges_timed/smartrics/restfixture.csv | 4 ++-- .../smartsheet-java-sdk.csv | 4 ++-- results/combined/merges_timed/snazy/ohc.csv | 4 ++-- .../sndyuk/logback-more-appenders.csv | 4 ++-- .../merges_timed/soabase/exhibitor.csv | 4 ++-- .../socialsensor/graphdb-benchmarks.csv | 4 ++-- .../sockeqwe/annotatedadapter.csv | 4 ++-- .../merges_timed/sockeqwe/fragmentargs.csv | 4 ++-- .../socketio4netty/socketio4j.csv | 4 ++-- .../merges_timed/sofastack/sofa-bolt.csv | 4 ++-- .../merges_timed/softinstigate/restheart.csv | 4 ++-- .../merges_timed/solita/functional-utils.csv | 4 ++-- .../solovyevk/htm-cla-visualizer.csv | 4 ++-- .../sonarcommunity/sonar-build-breaker.csv | 4 ++-- .../sonarcommunity/sonar-ldap.csv | 4 ++-- .../merges_timed/sonarcommunity/sonar-php.csv | 4 ++-- .../merges_timed/sonarcommunity/sonar-pmd.csv | 4 ++-- .../sonarcommunity/sonar-scm-activity.csv | 4 ++-- .../merges_timed/sonarcommunity/sonar-web.csv | 4 ++-- .../merges_timed/sonarcommunity/sonar-xml.csv | 4 ++-- .../sonarsource/jenkins-sonar-plugin.csv | 4 ++-- .../sonarsource/sonar-findbugs.csv | 4 ++-- .../combined/merges_timed/sonatype/jgit.csv | 4 ++-- .../merges_timed/sonatype/plexus-compiler.csv | 4 ++-- .../soundcloud/prometheus-hystrix.csv | 4 ++-- .../merges_timed/spigotmc/bungeecord.csv | 4 ++-- .../spinscale/dropwizard-jobs.csv | 4 ++-- .../splunk/splunk-library-javalogging.csv | 4 ++-- .../combined/merges_timed/spotify/apollo.csv | 4 ++-- .../merges_timed/spotify/dockerfile-maven.csv | 4 ++-- .../spotify/elasticsearch-index-window.csv | 4 ++-- .../merges_timed/spotify/ffwd-java.csv | 4 ++-- .../merges_timed/spotify/hdfs2cass.csv | 4 ++-- .../merges_timed/spotify/netty-zmtp.csv | 4 ++-- .../spoutcraft/legacylauncher.csv | 4 ++-- .../spring-data-elasticsearch.csv | 4 ++-- .../spring-projects/spring-guice.csv | 4 ++-- .../combined/merges_timed/sps/pushover4j.csv | 4 ++-- .../merges_timed/spullara/cli-parser.csv | 4 ++-- .../spullara/java-future-jdk8.csv | 4 ++-- .../combined/merges_timed/square/burst.csv | 4 ++-- .../combined/merges_timed/square/javapoet.csv | 4 ++-- .../combined/merges_timed/srdc/ontmalizer.csv | 4 ++-- .../merges_timed/srt/asterisk-java.csv | 4 ++-- .../sstrickx/yahoofinance-api.csv | 4 ++-- .../stackforge/monasca-common.csv | 4 ++-- .../combined/merges_timed/stapler/stapler.csv | 4 ++-- .../merges_timed/statefulj/statefulj.csv | 4 ++-- .../merges_timed/stealthly/xml-avro.csv | 4 ++-- .../stefanhendriks/dune2themaker4j.csv | 4 ++-- .../merges_timed/stephenc/high-scale-lib.csv | 4 ++-- .../merges_timed/stephenc/java-iso-tools.csv | 4 ++-- .../merges_timed/steveice10/mcprotocollib.csv | 4 ++-- .../merges_timed/steveice10/packetlib.csv | 4 ++-- .../dependency-check-sonar-plugin.csv | 4 ++-- .../merges_timed/stoicflame/enunciate.csv | 4 ++-- .../merges_timed/stratehm/stratum-proxy.csv | 4 ++-- .../merges_timed/straup/dogeared-extruder.csv | 4 ++-- .../merges_timed/stripesframework/stripes.csv | 4 ++-- .../combined/merges_timed/structr/structr.csv | 4 ++-- .../stuartgunter/dropwizard-cassandra.csv | 4 ++-- .../merges_timed/sviperll/static-mustache.csv | 4 ++-- .../swagger-api/swagger-codegen.csv | 4 ++-- .../swagger-api/swagger-parser.csv | 4 ++-- .../swagger-api/validator-badge.csv | 4 ++-- .../sylvain-bugat/rundeckmonitor.csv | 4 ++-- .../merges_timed/synbiodex/libsbolj.csv | 4 ++-- .../combined/merges_timed/syncleus/ferma.csv | 4 ++-- .../merges_timed/synergian/wagon-git.csv | 4 ++-- .../merges_timed/t-oster/liblasercut.csv | 4 ++-- results/combined/merges_timed/t0xa/gelfj.csv | 4 ++-- .../merges_timed/tabulapdf/tabula-java.csv | 4 ++-- .../merges_timed/tacitknowledge/jcr-mock.csv | 4 ++-- .../merges_timed/tackley/dbdeploy.csv | 4 ++-- .../merges_timed/tadglines/socket.io-java.csv | 4 ++-- .../merges_timed/taimos/daemon-framework.csv | 4 ++-- .../merges_timed/takari/maven-polyglot.csv | 4 ++-- .../merges_timed/takari/maven-profiler.csv | 4 ++-- .../merges_timed/taotaotheripper/sault.csv | 4 ++-- results/combined/merges_timed/tarql/tarql.csv | 4 ++-- .../tasermonkey/thumbnailator.csv | 4 ++-- .../merges_timed/tatsuhiro-t/argparse4j.csv | 4 ++-- results/combined/merges_timed/tcurdt/jdeb.csv | 4 ++-- .../tdebatty/string-similarity.csv | 4 ++-- .../tdesjardins/gwt-ol3-playground.csv | 4 ++-- .../merges_timed/tdunning/log-synth.csv | 4 ++-- .../merges_timed/tdunning/t-digest.csv | 4 ++-- .../combined/merges_timed/teamed/qulice.csv | 4 ++-- .../tech-advantage/sonar-gerrit-plugin.csv | 4 ++-- .../techblue/alfresco-restclient.csv | 4 ++-- .../merges_timed/technicpack/launchercore.csv | 4 ++-- .../merges_timed/technicpack/launcherv3.csv | 4 ++-- .../technophobia/substeps-core.csv | 4 ++-- .../teknux-org/jetty-bootstrap.csv | 4 ++-- .../netphony-network-protocols.csv | 4 ++-- results/combined/merges_timed/termd/termd.csv | 4 ++-- .../testingbot/testingbot-tunnel.csv | 4 ++-- .../texasdigitallibrary/vireo.csv | 4 ++-- .../combined/merges_timed/tgac/miso-lims.csv | 4 ++-- .../merges_timed/thealgorithms/java.csv | 4 ++-- .../theholywaffle/teamspeak-3-java-api.csv | 4 ++-- .../thelinmichael/spotify-web-api-java.csv | 4 ++-- .../spring-hibernate-20120924.csv | 4 ++-- .../thepoofy/foursquare_v2_java_adapter.csv | 4 ++-- .../theupswell/appengine-counter.csv | 4 ++-- .../merges_timed/thinkgem/jeesite.csv | 4 ++-- .../thomas-joiner/hunspellbridj.csv | 4 ++-- .../thomasjungblut/tjungblut-math.csv | 4 ++-- .../merges_timed/thoqbk/traprange.csv | 4 ++-- .../merges_timed/threerings/getdown.csv | 4 ++-- .../merges_timed/threeten/threeten-extra.csv | 4 ++-- .../thymeleafexamples-springmail.csv | 4 ++-- .../combined/merges_timed/timroes/axmlrpc.csv | 4 ++-- .../combined/merges_timed/tipsy/javalin.csv | 4 ++-- .../merges_timed/titokone/titokone.csv | 4 ++-- .../tkelley-eg/collectd-fast-jmx.csv | 4 ++-- .../combined/merges_timed/tntim96/jscover.csv | 4 ++-- .../combined/merges_timed/tomitribe/crest.csv | 4 ++-- .../torquebox/jruby-maven-plugins.csv | 4 ++-- .../tpietzsch/bigdataviewer-core.csv | 4 ++-- .../merges_timed/tpietzsch/spimviewer.csv | 4 ++-- .../tqh/uglifyjs-maven-plugin.csv | 4 ++-- .../combined/merges_timed/tracee/tracee.csv | 4 ++-- .../trecloux/yeoman-maven-plugin.csv | 4 ++-- .../merges_timed/tridentsdk/tridentsdk.csv | 4 ++-- .../trung/inmemoryjavacompiler.csv | 4 ++-- .../merges_timed/tuanhiep/mqtt-jmeter.csv | 4 ++-- .../tuck182/harmony-java-client.csv | 4 ++-- .../combined/merges_timed/tumblr/jumblr.csv | 4 ++-- .../combined/merges_timed/tupilabs/tap4j.csv | 4 ++-- .../merges_timed/turbospaces/turbospaces.csv | 4 ++-- .../merges_timed/turini/vraptor-authz.csv | 4 ++-- .../merges_timed/twilio/starter-java.csv | 4 ++-- .../merges_timed/twilio/twilio-java.csv | 4 ++-- .../merges_timed/tyagihas/java_nats.csv | 4 ++-- .../merges_timed/tynamo/tapestry-security.csv | 4 ++-- .../ubervu/elasticsearch-river-github.csv | 4 ++-- .../merges_timed/uklimaschewski/evalex.csv | 4 ++-- .../umut/spring-social-salesforce.csv | 4 ++-- .../unitsofmeasurement/unit-api.csv | 4 ++-- .../unitsofmeasurement/unit-impl-se.csv | 4 ++-- .../unitsofmeasurement/uom-se.csv | 4 ++-- .../univocity/univocity-parsers.csv | 4 ++-- .../merges_timed/unruly/junit-rules.csv | 4 ++-- .../merges_timed/urbanairship/datacube.csv | 4 ++-- .../urbanairship/java-library.csv | 4 ++-- .../merges_timed/urbancode/terraform.csv | 4 ++-- .../merges_timed/urish/gwt-titanium.csv | 4 ++-- .../uwolfer/gerrit-rest-java-client.csv | 4 ++-- .../merges_timed/valotrading/silvertip.csv | 4 ++-- .../combined/merges_timed/vandurme/jerboa.csv | 4 ++-- .../merges_timed/vanduynslagerp/enml4j.csv | 4 ++-- .../vbehar/rundeck-api-java-client.csv | 4 ++-- .../spring-boot-security-saml-sample.csv | 4 ++-- .../merges_timed/vdurmont/emoji-java.csv | 4 ++-- .../javaverbalexpressions.csv | 4 ++-- .../combined/merges_timed/verhas/djcproxy.csv | 4 ++-- .../versioneye/versioneye_maven_plugin.csv | 4 ++-- .../combined/merges_timed/vert-x3/docgen.csv | 4 ++-- .../merges_timed/vert-x3/vertx-docgen.csv | 4 ++-- .../combined/merges_timed/vidstige/jadb.csv | 4 ++-- results/combined/merges_timed/vietj/modsh.csv | 4 ++-- .../vijay2win/flume-cassandra-sink.csv | 4 ++-- .../combined/merges_timed/vipshop/saturn.csv | 4 ++-- .../combined/merges_timed/vkostyukov/la4j.csv | 4 ++-- .../vojtechhabarta/typescript-generator.csv | 4 ++-- .../vt-middleware/cryptacular.csv | 4 ++-- .../merges_timed/w3c/ldp-testsuite.csv | 4 ++-- .../merges_timed/wakaleo/game-of-life.csv | 4 ++-- .../warmuuh/libsass-maven-plugin.csv | 4 ++-- .../combined/merges_timed/wasdev/ci.ant.csv | 4 ++-- .../combined/merges_timed/wasdev/ci.maven.csv | 4 ++-- .../combined/merges_timed/webbit/webbit.csv | 4 ++-- .../merges_timed/webbukkit/dynmapcoreapi.csv | 4 ++-- .../merges_timed/webjars/webjars-locator.csv | 4 ++-- .../merges_timed/whizzosoftware/wzwave.csv | 4 ++-- .../wikimedia/search-highlighter.csv | 4 ++-- .../merges_timed/wildfirechat/server.csv | 4 ++-- .../wildfly/jandex-maven-plugin.csv | 4 ++-- .../winder/universal-g-code-sender.csv | 4 ++-- .../combined/merges_timed/wizzercn/nutzwk.csv | 4 ++-- .../wkennedy/swagger4spring-web.csv | 4 ++-- .../wnagele/hadoop-filesystem-sftp.csv | 4 ++-- .../combined/merges_timed/wnbittle/dyn4j.csv | 4 ++-- .../merges_timed/wocommunity/wonder.csv | 4 ++-- .../combined/merges_timed/woder/torchbot.csv | 4 ++-- results/combined/merges_timed/wokier/teh.csv | 4 ++-- .../merges_timed/wordnik/swagger-codegen.csv | 4 ++-- .../combined/merges_timed/wsky/top-push.csv | 4 ++-- .../merges_timed/wstrange/googleauth.csv | 4 ++-- .../wvengen/proguard-maven-plugin.csv | 4 ++-- .../merges_timed/wwadge/hbnpojogen.csv | 4 ++-- .../combined/merges_timed/xaverw/msearch.csv | 4 ++-- .../merges_timed/xceptance/xcmailr.csv | 4 ++-- .../combined/merges_timed/xebia/xebium.csv | 4 ++-- .../merges_timed/xerial/sqlite-jdbc.csv | 4 ++-- .../combined/merges_timed/xuxueli/xxl-job.csv | 4 ++-- .../merges_timed/yandex-qatools/ashot.csv | 4 ++-- .../yandex-qatools/postgresql-embedded.csv | 4 ++-- .../elasticsearch-entity-resolution.csv | 4 ++-- .../merges_timed/yaphone/itchat4j.csv | 4 ++-- .../combined/merges_timed/yegor256/rexsl.csv | 4 ++-- .../combined/merges_timed/yegor256/xembly.csv | 4 ++-- .../merges_timed/yfpeng/pengyifan-commons.csv | 4 ++-- .../yfpeng/pengyifan-leetcode.csv | 4 ++-- results/combined/merges_timed/yinlou/mltk.csv | 4 ++-- .../merges_timed/yinwang0/rubysonar.csv | 4 ++-- .../merges_timed/ymnk/jsch-agent-proxy.csv | 4 ++-- .../merges_timed/yubico/ykneo-openpgp.csv | 4 ++-- .../zalando/java-sproc-wrapper.csv | 4 ++-- .../merges_timed/zauberlabs/gnip4j.csv | 4 ++-- .../zenria/weed-fs-java-client.csv | 4 ++-- .../combined/merges_timed/zeromq/jeromq.csv | 4 ++-- .../merges_timed/zeroturnaround/zt-zip.csv | 4 ++-- .../combined/merges_timed/zextras/openzal.csv | 4 ++-- .../zhegexiaohuozi/jsoupxpath.csv | 4 ++-- .../merges_timed/zhongdj/lifecycle.csv | 4 ++-- .../merges_timed/zhuowei/raspberryjuice.csv | 4 ++-- .../zsoltfabok/dojo.exercises.csv | 4 ++-- results/combined/merges_timed/zxing/zxing.csv | 4 ++-- .../combined/plots/all/cost_with_manual.pdf | Bin 37538 -> 37538 bytes .../plots/all/cost_without_manual.pdf | Bin 37704 -> 37704 bytes results/combined/plots/all/heatmap.pdf | Bin 60475 -> 60475 bytes .../combined/plots/git/cost_with_manual.pdf | Bin 34351 -> 34351 bytes .../plots/git/cost_without_manual.pdf | Bin 34009 -> 34009 bytes results/combined/plots/git/heatmap.pdf | Bin 35576 -> 35576 bytes .../combined/plots/tools/cost_with_manual.pdf | Bin 35853 -> 35853 bytes .../plots/tools/cost_without_manual.pdf | Bin 35789 -> 35789 bytes results/combined/plots/tools/heatmap.pdf | Bin 40165 -> 40165 bytes .../combined/tables/all/table_run_time.tex | 16 ++++++++++++++++ .../merges_analyzer_histograms.pdf | Bin 34047 -> 34047 bytes .../plots/all/cost_with_manual.pdf | Bin 37326 -> 37326 bytes .../plots/all/cost_without_manual.pdf | Bin 37679 -> 37679 bytes results/greatest_hits/plots/all/heatmap.pdf | Bin 61612 -> 61612 bytes .../plots/git/cost_with_manual.pdf | Bin 34395 -> 34395 bytes .../plots/git/cost_without_manual.pdf | Bin 34013 -> 34013 bytes results/greatest_hits/plots/git/heatmap.pdf | Bin 35841 -> 35841 bytes .../plots/tools/cost_with_manual.pdf | Bin 35896 -> 35896 bytes .../plots/tools/cost_without_manual.pdf | Bin 35775 -> 35775 bytes results/greatest_hits/plots/tools/heatmap.pdf | Bin 40790 -> 40790 bytes results/reaper/merges_analyzer_histograms.pdf | Bin 206682 -> 206682 bytes results/reaper/plots/all/cost_with_manual.pdf | Bin 37546 -> 37546 bytes .../reaper/plots/all/cost_without_manual.pdf | Bin 37718 -> 37718 bytes results/reaper/plots/all/heatmap.pdf | Bin 60865 -> 60865 bytes results/reaper/plots/git/cost_with_manual.pdf | Bin 34349 -> 34349 bytes .../reaper/plots/git/cost_without_manual.pdf | Bin 34026 -> 34026 bytes results/reaper/plots/git/heatmap.pdf | Bin 36874 -> 36874 bytes .../reaper/plots/tools/cost_with_manual.pdf | Bin 35860 -> 35860 bytes .../plots/tools/cost_without_manual.pdf | Bin 35787 -> 35787 bytes results/reaper/plots/tools/heatmap.pdf | Bin 40152 -> 40152 bytes src/python/latex_output.py | 2 -- src/python/merge_runtime_measure.py | 2 -- 1153 files changed, 2256 insertions(+), 2244 deletions(-) diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf index 95077445c9c506019508d5dbdaaa16af998a5688..6fb1ceda3c7a212288046947eb367a6aac9ce976 100644 GIT binary patch delta 28 jcmdnp%)7gpx1oixg=q^jqYay(fw7s1;dXW#<}IuMg%k(@ delta 28 jcmdnp%)7gpx1oixg=q^jqYayZg@L7^>2`J-<}IuMg<%K@ diff --git a/results/combined/merges_timed/47deg/firebrand.csv b/results/combined/merges_timed/47deg/firebrand.csv index 08be81e4c5..8a18412cbc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,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,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,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,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,e20dfe24a4e22564b4f5583eadb310bef587d0a4d5f890333b72d7ea6905e7be,Tests_failed,b336d00b45896445ff0cf8de2fcfdca273c57d8dc1347ee34704a5847569b1d3,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.021646499633789062,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.07213640213012695,1.2309420108795166,0.5644748210906982,0.04004669189453125,0.06865620613098145,0.03979325294494629,0.06742548942565918,0.06205630302429199 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,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,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,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,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,e20dfe24a4e22564b4f5583eadb310bef587d0a4d5f890333b72d7ea6905e7be,Tests_failed,b336d00b45896445ff0cf8de2fcfdca273c57d8dc1347ee34704a5847569b1d3,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.021646499633789062,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.07213640213012695,1.2309420108795166,0.5644748210906982,0.04004669189453125,0.06865620613098145,0.03979325294494629,0.06742548942565918,0.06205630302429199,0.06316733360290527,0.06530332565307617,0.06674742698669434,0.06381368637084961,0.06529831886291504,0.06418371200561523,0.06486797332763672,0.10125136375427246,0.09738397598266602,1.2239487171173096,0.6188781261444092,0.06580519676208496,0.06622195243835449,0.06671762466430664,0.06669974327087402,0.06281089782714844 diff --git a/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv b/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv index 16050bce34..cddb83799d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,True,False,Tests_passed,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,True,2,3,4,2,True,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,True,2,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,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,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,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,58a2fb9f18ae675553af6c6a44bf85dc546ddb75efd21c37f64e81cdcfe6f0cb,Tests_failed,01e22091a4fb98a78e168e3b72fc85257d2b5c77966e628a15d89c2ff7741b3e,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,0.04126715660095215,0.043260812759399414,0.035515785217285156,0.013983488082885742,0.03974151611328125,0.04084277153015137,0.04258370399475098,0.15624451637268066,0.11542272567749023,1.0952305793762207,0.32166218757629395,0.02881646156311035,0.05475354194641113,0.028844594955444336,0.05450153350830078,0.05444598197937012 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,True,False,Tests_passed,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,True,2,3,4,2,True,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,True,2,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,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,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,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,58a2fb9f18ae675553af6c6a44bf85dc546ddb75efd21c37f64e81cdcfe6f0cb,Tests_failed,01e22091a4fb98a78e168e3b72fc85257d2b5c77966e628a15d89c2ff7741b3e,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,0.04126715660095215,0.043260812759399414,0.035515785217285156,0.013983488082885742,0.03974151611328125,0.04084277153015137,0.04258370399475098,0.15624451637268066,0.11542272567749023,1.0952305793762207,0.32166218757629395,0.02881646156311035,0.05475354194641113,0.028844594955444336,0.05450153350830078,0.05444598197937012,0.05302858352661133,0.052092552185058594,0.05198955535888672,0.05207324028015137,0.0532228946685791,0.051245927810668945,0.04944205284118652,0.08232235908508301,0.08249187469482422,1.077906847000122,0.3394303321838379,0.05149435997009277,0.052803993225097656,0.052358150482177734,0.051606178283691406,0.053166866302490234 diff --git a/results/combined/merges_timed/ab0oo/javaprslib.csv b/results/combined/merges_timed/ab0oo/javaprslib.csv index 32b4aa5407..827e28558c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,82c347262d2a49b6e272be96e30e53d0fd35566a40c53feeec268d9a0ac3a971,Merge_failed,6f4b7aee383b79b6a4b220ef80723770f835254ce59003d80638b8e2f3ea80cb,Merge_failed,e82bb82bf7af9410cdcf08135e32cdf6ea44984cb38113a3c67c6f6c9e7fc723,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,0.06235551834106445,0.04878687858581543,0.06207394599914551,0.023397445678710938,0.048295021057128906,0.04230785369873047,0.05101799964904785,0.5498142242431641,0.4436039924621582,3.4207303524017334,0.6280825138092041,0.06876707077026367,0.13005352020263672,0.07056522369384766,0.12825489044189453,0.12752771377563477 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,82c347262d2a49b6e272be96e30e53d0fd35566a40c53feeec268d9a0ac3a971,Merge_failed,6f4b7aee383b79b6a4b220ef80723770f835254ce59003d80638b8e2f3ea80cb,Merge_failed,e82bb82bf7af9410cdcf08135e32cdf6ea44984cb38113a3c67c6f6c9e7fc723,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,Merge_failed,b5fc16c18e3bcc9a4dea1c5ec3866d1f373f0b9a68184d3f9d329515bcd98518,0.06235551834106445,0.04878687858581543,0.06207394599914551,0.023397445678710938,0.048295021057128906,0.04230785369873047,0.05101799964904785,0.5498142242431641,0.4436039924621582,3.4207303524017334,0.6280825138092041,0.06876707077026367,0.13005352020263672,0.07056522369384766,0.12825489044189453,0.12752771377563477,0.1214151382446289,0.12135052680969238,0.12206053733825684,0.12288331985473633,0.12545323371887207,0.12328600883483887,0.12416934967041016,0.2542572021484375,0.29935312271118164,3.4656577110290527,0.7340188026428223,0.12286043167114258,0.12399005889892578,0.12500548362731934,0.12235426902770996,0.12202095985412598 diff --git a/results/combined/merges_timed/abel533/echarts.csv b/results/combined/merges_timed/abel533/echarts.csv index a1bd6e4903..92a8758616 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,6ab074bee9f00101f14b58e03a8cfeddb897a9303b18ed770c41f43852c92c6e,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,1a28a93ec9bff7f336189ab717c3b666e92ee0be8286c0955f608030d30e88d6,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,0.058470726013183594,0.05220508575439453,0.05234074592590332,0.021357297897338867,0.04126787185668945,0.058524370193481445,0.0620577335357666,0.37039971351623535,0.29036879539489746,1.5497477054595947,0.6489584445953369,0.04574942588806152,0.10720038414001465,0.04746532440185547,0.10683131217956543,0.10705828666687012 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,6ab074bee9f00101f14b58e03a8cfeddb897a9303b18ed770c41f43852c92c6e,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,1a28a93ec9bff7f336189ab717c3b666e92ee0be8286c0955f608030d30e88d6,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,0.058470726013183594,0.05220508575439453,0.05234074592590332,0.021357297897338867,0.04126787185668945,0.058524370193481445,0.0620577335357666,0.37039971351623535,0.29036879539489746,1.5497477054595947,0.6489584445953369,0.04574942588806152,0.10720038414001465,0.04746532440185547,0.10683131217956543,0.10705828666687012,0.10832691192626953,0.1064138412475586,0.10765671730041504,0.10865259170532227,0.11389708518981934,0.10763740539550781,0.10999393463134766,0.19243478775024414,0.21667838096618652,1.7411296367645264,0.7648873329162598,0.10757970809936523,0.10765194892883301,0.10677504539489746,0.10851430892944336,0.10816097259521484 diff --git a/results/combined/merges_timed/acciente/oacc-core.csv b/results/combined/merges_timed/acciente/oacc-core.csv index ac79292a55..cfa51ca53d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,True,214,296,1066,18,True,215,Tests_passed,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,True,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,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,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,7e19ec0cf0f21172ba4d578b8e80eb6f97ede722f946794cfa13df05dc14350f,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,9b3a6545cbd07bc276c83fd88fe513bbd264f078dfead7bf93c85245144d1eb6,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,0.050095558166503906,0.051225900650024414,0.06375885009765625,0.061248779296875,0.05429577827453613,0.06433653831481934,0.0503392219543457,1.1793642044067383,0.9874467849731445,15.49375867843628,4.254236936569214,0.10832548141479492,0.567054033279419,0.10579109191894531,0.45230841636657715,0.5766050815582275 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,True,214,296,1066,18,True,215,Tests_passed,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,True,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,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,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,7e19ec0cf0f21172ba4d578b8e80eb6f97ede722f946794cfa13df05dc14350f,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,9b3a6545cbd07bc276c83fd88fe513bbd264f078dfead7bf93c85245144d1eb6,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,65dd2145cdff7e0f3f1ff3e4b6376315df9aa6ed29e174b6ae2cb280e1212b9c,Merge_failed,8e5d6be32858388b46486f250ca41ba8efc0ef7f923814287c3a9a83bbb9a57a,0.050095558166503906,0.051225900650024414,0.06375885009765625,0.061248779296875,0.05429577827453613,0.06433653831481934,0.0503392219543457,1.1793642044067383,0.9874467849731445,15.49375867843628,4.254236936569214,0.10832548141479492,0.567054033279419,0.10579109191894531,0.45230841636657715,0.5766050815582275,0.48580050468444824,0.44907569885253906,0.5632526874542236,0.4495522975921631,0.5933077335357666,0.4563717842102051,0.5862951278686523,0.8317279815673828,0.9313786029815674,17.066736936569214,5.165014743804932,0.4874405860900879,0.43682146072387695,0.5531826019287109,0.4464387893676758,0.5929431915283203 diff --git a/results/combined/merges_timed/accla/d4m_api_java.csv b/results/combined/merges_timed/accla/d4m_api_java.csv index c5763f599e..e440633c43 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,True,27,84,260,3,True,27,Tests_passed,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,True,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,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,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,Merge_failed,39047279777ad31c16331ab53db7fc7d83f07f05fb726ada749baffe8c3a283b,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,a9f35eb12e6bfcab40ddfe84566e6e2626f0106dd1e8ecbbc2571711b7f4c514,Tests_timedout,8db1c826a5da8fa8e73f2a7e4ceeed5b13e633433bf1523b71c66953d321a1e4,,,,,,,,,,,,,,,0.048334598541259766,0.03995060920715332,0.047515869140625,0.020933866500854492,0.03248739242553711,0.05497384071350098,0.04095602035522461,0.1878986358642578,0.13338041305541992,3.1145060062408447,1.1394643783569336,0.12267470359802246,0.14567136764526367,0.12895464897155762,0.14760279655456543,0.139634370803833 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,True,27,84,260,3,True,27,Tests_passed,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,True,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,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,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,Merge_failed,39047279777ad31c16331ab53db7fc7d83f07f05fb726ada749baffe8c3a283b,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,35076bea51e708277de654c59b4e232544d50fd865e5ad5a11de2d1790b48df3,Merge_failed,a9f35eb12e6bfcab40ddfe84566e6e2626f0106dd1e8ecbbc2571711b7f4c514,Tests_timedout,8db1c826a5da8fa8e73f2a7e4ceeed5b13e633433bf1523b71c66953d321a1e4,,,,,,,,,,,,,,,0.048334598541259766,0.03995060920715332,0.047515869140625,0.020933866500854492,0.03248739242553711,0.05497384071350098,0.04095602035522461,0.1878986358642578,0.13338041305541992,3.1145060062408447,1.1394643783569336,0.12267470359802246,0.14567136764526367,0.12895464897155762,0.14760279655456543,0.139634370803833,0.22434067726135254,0.14891839027404785,0.14641880989074707,0.14842724800109863,0.15034103393554688,0.15088653564453125,0.14584946632385254,0.12858915328979492,0.16317415237426758,3.5291712284088135,1.3010103702545166,0.0761559009552002,0.07690548896789551,0.14718985557556152,0.14234471321105957,0.14798521995544434 diff --git a/results/combined/merges_timed/adamd/z.csv b/results/combined/merges_timed/adamd/z.csv index b63785d496..4e1e79e800 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,True,True,Tests_passed,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,True,19,71,1095,2,True,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,True,19,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,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Tests_passed,82fcc032f233130b52e61a32a1d09986fd5c3a4bd678758c5115182c292da01d,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,b712ab9be3f2c4691d25465826742e50958bdfb593f7e5535749055c719dcdb1,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_passed,ff3fd56be0ffa643c24d6ec465068b4e205c2a81d43fa39c6e7c70c42fd3ed77,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,0.04894566535949707,0.032440900802612305,0.042497873306274414,0.01907515525817871,0.04343724250793457,0.0345759391784668,0.04829692840576172,0.1744997501373291,0.12603282928466797,2.02311372756958,0.6244802474975586,0.05681109428405762,0.04805469512939453,0.04683804512023926,0.04693293571472168,0.04788398742675781 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,True,True,Tests_passed,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,True,19,71,1095,2,True,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,True,19,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,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Tests_passed,82fcc032f233130b52e61a32a1d09986fd5c3a4bd678758c5115182c292da01d,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,b712ab9be3f2c4691d25465826742e50958bdfb593f7e5535749055c719dcdb1,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_passed,ff3fd56be0ffa643c24d6ec465068b4e205c2a81d43fa39c6e7c70c42fd3ed77,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,0.04894566535949707,0.032440900802612305,0.042497873306274414,0.01907515525817871,0.04343724250793457,0.0345759391784668,0.04829692840576172,0.1744997501373291,0.12603282928466797,2.02311372756958,0.6244802474975586,0.05681109428405762,0.04805469512939453,0.04683804512023926,0.04693293571472168,0.04788398742675781,0.04730081558227539,0.04681730270385742,0.045372724533081055,0.04582929611206055,0.04598355293273926,0.04432225227355957,0.0468602180480957,0.07881951332092285,0.08284711837768555,2.009204626083374,0.6682085990905762,0.04632902145385742,0.04586291313171387,0.04709029197692871,0.045050859451293945,0.04706597328186035 diff --git a/results/combined/merges_timed/adangel/pmd.csv b/results/combined/merges_timed/adangel/pmd.csv index d82e7a41d0..78055959d8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,True,True,True,436.0,1210,8471.0,3,True,436,Tests_passed,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,True,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,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,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_timedout,,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7d36122fe683538187d5a27ee93fdac3cad19eb578a2620427de726017ea74f1,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,80fdea341ec501371ca5561b554c46dd54bb1363ba237218cf90d31960136c20,Merge_timedout,,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,0.059174299240112305,0.0492095947265625,0.061598777770996094,0.0668802261352539,0.07065439224243164,0.07184767723083496,0.06354117393493652,0.3733937740325928,0.17336368560791016,1.0058441162109375,-1.0,0.10024142265319824,0.12860798835754395,0.1046450138092041,0.13256168365478516,0.13156819343566895 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,True,True,True,436.0,1210,8471.0,3,True,436,Tests_passed,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,True,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,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,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_timedout,,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7d36122fe683538187d5a27ee93fdac3cad19eb578a2620427de726017ea74f1,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,80fdea341ec501371ca5561b554c46dd54bb1363ba237218cf90d31960136c20,Merge_timedout,,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,0.059174299240112305,0.0492095947265625,0.061598777770996094,0.0668802261352539,0.07065439224243164,0.07184767723083496,0.06354117393493652,0.3733937740325928,0.17336368560791016,1.0058441162109375,-1.0,0.10024142265319824,0.12860798835754395,0.1046450138092041,0.13256168365478516,0.13156819343566895,0.12386465072631836,0.12156152725219727,0.13189101219177246,0.13436651229858398,0.13082098960876465,0.13323545455932617,0.13225388526916504,0.1980607509613037,0.20030546188354492,1.1002724170684814,-1.0,0.1214909553527832,0.12084197998046875,0.11966228485107422,0.11902999877929688,0.11596441268920898 diff --git a/results/combined/merges_timed/addthis/meshy.csv b/results/combined/merges_timed/addthis/meshy.csv index 8d3053d01d..8b068e3509 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,True,16,42,313,2,True,16,Tests_passed,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,True,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,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,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,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,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,0aa330a27510b9259497e01e543cff0fcedd841fb45366cd1325129e6e32e13d,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,0.01888275146484375,0.01868128776550293,0.023008108139038086,0.0327455997467041,0.023616313934326172,0.02317953109741211,0.023730993270874023,0.05086326599121094,0.07240724563598633,1.0570788383483887,0.5422835350036621,0.05487203598022461,0.08089327812194824,0.05311894416809082,0.08354401588439941,0.08120107650756836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,True,16,42,313,2,True,16,Tests_passed,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,True,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,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,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,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,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,0aa330a27510b9259497e01e543cff0fcedd841fb45366cd1325129e6e32e13d,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,0.01888275146484375,0.01868128776550293,0.023008108139038086,0.0327455997467041,0.023616313934326172,0.02317953109741211,0.023730993270874023,0.05086326599121094,0.07240724563598633,1.0570788383483887,0.5422835350036621,0.05487203598022461,0.08089327812194824,0.05311894416809082,0.08354401588439941,0.08120107650756836,0.0851590633392334,0.08455896377563477,0.0846414566040039,0.0883784294128418,0.08930540084838867,0.08751606941223145,0.08897042274475098,0.132279634475708,0.11251354217529297,1.3645524978637695,0.6144735813140869,0.08384490013122559,0.0856320858001709,0.08293700218200684,0.08299708366394043,0.08273482322692871 diff --git a/results/combined/merges_timed/addthis/stream-lib.csv b/results/combined/merges_timed/addthis/stream-lib.csv index f7bc76130b..0ac6d66647 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,True,25,127,1477,4,True,27,Tests_passed,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,True,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,True,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.04084444046020508,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.11559677124023438,0.6391665935516357,0.5595741271972656,0.0677194595336914,0.06132006645202637,0.06919717788696289,0.0646979808807373,0.06066584587097168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,True,25,127,1477,4,True,27,Tests_passed,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,True,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,True,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.04084444046020508,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.11559677124023438,0.6391665935516357,0.5595741271972656,0.0677194595336914,0.06132006645202637,0.06919717788696289,0.0646979808807373,0.06066584587097168,0.06439542770385742,0.06629824638366699,0.06865715980529785,0.07046651840209961,0.06636452674865723,0.07318830490112305,0.0686647891998291,0.11291980743408203,0.10989546775817871,0.747685432434082,0.6774680614471436,0.05909395217895508,0.06610798835754395,0.06583452224731445,0.06493091583251953,0.06872105598449707 diff --git a/results/combined/merges_timed/adoptopenjdk/mjprof.csv b/results/combined/merges_timed/adoptopenjdk/mjprof.csv index 19b35bd124..72da4b058f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,True,44,134,1897,5,True,44,Tests_passed,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,True,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Tests_failed,7bb5087bd724eafa7d8aea7171c7bdda545a3b19e5f150d5b3140047d2a68a0c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,b66808e370916cd46b21fd3e1b2f0fa1460139318bf1ac79df3863507793e4a9,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,e8d6ff408ceab01c0e231705669a541330468415c44af35f2151a25af90fe80d,Tests_failed,ddd226fae122df4af7c93ca6620856f5f4f11798bec00516c379e26f14b2809e,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,0.04915285110473633,0.043497323989868164,0.04964947700500488,0.02007913589477539,0.051734209060668945,0.03849434852600098,0.05000710487365723,0.36870265007019043,0.2714059352874756,2.2204344272613525,0.6183292865753174,0.04882025718688965,0.10489988327026367,0.04705643653869629,0.10595464706420898,0.1070566177368164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,True,44,134,1897,5,True,44,Tests_passed,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,True,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Tests_failed,7bb5087bd724eafa7d8aea7171c7bdda545a3b19e5f150d5b3140047d2a68a0c,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,b66808e370916cd46b21fd3e1b2f0fa1460139318bf1ac79df3863507793e4a9,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,e8d6ff408ceab01c0e231705669a541330468415c44af35f2151a25af90fe80d,Tests_failed,ddd226fae122df4af7c93ca6620856f5f4f11798bec00516c379e26f14b2809e,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,0.04915285110473633,0.043497323989868164,0.04964947700500488,0.02007913589477539,0.051734209060668945,0.03849434852600098,0.05000710487365723,0.36870265007019043,0.2714059352874756,2.2204344272613525,0.6183292865753174,0.04882025718688965,0.10489988327026367,0.04705643653869629,0.10595464706420898,0.1070566177368164,0.10472273826599121,0.1042478084564209,0.106964111328125,0.10811591148376465,0.10504484176635742,0.1073310375213623,0.10699677467346191,0.19248318672180176,0.21516156196594238,2.5575640201568604,0.8175663948059082,0.10593700408935547,0.10615682601928711,0.10615897178649902,0.10492873191833496,0.10483217239379883 diff --git a/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv b/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv index 288120ec34..d5c6acaf10 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,True,9,21,75,2,True,9,Tests_passed,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,True,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,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,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,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,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,ad051678e7bc4acbd01417da5cf5e4d14b52e993c374a600751c53be90a60f12,Tests_failed,ba342a3e5172fd03a6764a3181d290c7e6c995fac81b3659109278166d6ea2ac,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,0.04066610336303711,0.0356898307800293,0.049436092376708984,0.014995336532592773,0.04697704315185547,0.038055419921875,0.04082536697387695,0.16793203353881836,0.11169123649597168,0.5147333145141602,0.306011438369751,0.031804800033569336,0.05443000793457031,0.03131270408630371,0.05389857292175293,0.05536818504333496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,True,9,21,75,2,True,9,Tests_passed,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,True,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,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,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,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,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,ad051678e7bc4acbd01417da5cf5e4d14b52e993c374a600751c53be90a60f12,Tests_failed,ba342a3e5172fd03a6764a3181d290c7e6c995fac81b3659109278166d6ea2ac,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,0.04066610336303711,0.0356898307800293,0.049436092376708984,0.014995336532592773,0.04697704315185547,0.038055419921875,0.04082536697387695,0.16793203353881836,0.11169123649597168,0.5147333145141602,0.306011438369751,0.031804800033569336,0.05443000793457031,0.03131270408630371,0.05389857292175293,0.05536818504333496,0.05237293243408203,0.05275607109069824,0.05226540565490723,0.051317453384399414,0.05238175392150879,0.053083181381225586,0.05390334129333496,0.08378911018371582,0.08476066589355469,0.5645182132720947,0.3602156639099121,0.053822994232177734,0.05192089080810547,0.05246162414550781,0.05235695838928223,0.05146074295043945 diff --git a/results/combined/merges_timed/aerospike/aerospike-client-java.csv b/results/combined/merges_timed/aerospike/aerospike-client-java.csv index b74326d138..4308505c9c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -66,refs/remotes/origin/proxy-stream-selection,94db6c183ad87d64bc7a89f731e55f65018ceea0,0df88d60943e223fb5842ed3292925c05f46e4a6,123bb510608100b0b51c51fb0d8b0f86d7628640,,True,True,Tests_passed,116d6520584868b62f4f7687e24e8dd133d7f90b5bdd1135564fdee82f46df0e,True,7,33,97,9,True,Tests_passed,af6222d6abee98f4a8744d2daf07fa3360d61c59321e0930640f1ab496b9f9c0,True,14,True,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,d6fa7cede56c5fbebb89fdf6e34c46ace5f6d8159cd5839021464a7163b7ad47,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Tests_failed,c9c12abc61fe491070fbdaa9ef4f0d740b05f4a2e3643fe26dd3071211f0d357,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,0dd8bab527e377164823d1ecfffed1fe990490cd5a8426b35c009e06fdded027,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Tests_failed,c9c12abc61fe491070fbdaa9ef4f0d740b05f4a2e3643fe26dd3071211f0d357,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,0.044617652893066406,0.04093766212463379,0.03664231300354004,0.015737056732177734,0.04131793975830078,0.04255843162536621,0.04135847091674805,0.18261218070983887,0.12122583389282227,0.629514217376709,0.8594145774841309,0.04222750663757324,0.04439544677734375,0.04389762878417969,0.045107126235961914,0.045610904693603516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +66,refs/remotes/origin/proxy-stream-selection,94db6c183ad87d64bc7a89f731e55f65018ceea0,0df88d60943e223fb5842ed3292925c05f46e4a6,123bb510608100b0b51c51fb0d8b0f86d7628640,,True,True,Tests_passed,116d6520584868b62f4f7687e24e8dd133d7f90b5bdd1135564fdee82f46df0e,True,7,33,97,9,True,Tests_passed,af6222d6abee98f4a8744d2daf07fa3360d61c59321e0930640f1ab496b9f9c0,True,14,True,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,d6fa7cede56c5fbebb89fdf6e34c46ace5f6d8159cd5839021464a7163b7ad47,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Tests_failed,c9c12abc61fe491070fbdaa9ef4f0d740b05f4a2e3643fe26dd3071211f0d357,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,0dd8bab527e377164823d1ecfffed1fe990490cd5a8426b35c009e06fdded027,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Tests_failed,c9c12abc61fe491070fbdaa9ef4f0d740b05f4a2e3643fe26dd3071211f0d357,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,0.044617652893066406,0.04093766212463379,0.03664231300354004,0.015737056732177734,0.04131793975830078,0.04255843162536621,0.04135847091674805,0.18261218070983887,0.12122583389282227,0.629514217376709,0.8594145774841309,0.04222750663757324,0.04439544677734375,0.04389762878417969,0.045107126235961914,0.045610904693603516,0.04558610916137695,0.04625296592712402,0.04545331001281738,0.046428680419921875,0.04437613487243652,0.044692277908325195,0.045803070068359375,0.07793068885803223,0.09089946746826172,0.7423615455627441,1.006889820098877,0.045946359634399414,0.04538750648498535,0.04575991630554199,0.04539084434509277,0.04535675048828125 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 dce68d5cc2..20dbdebded 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,True,True,Tests_passed,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,True,17,61,468,2,True,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,True,17,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,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,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,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,d0ef0b1d652eb6dc1d9348dba30a724eb4e397afefc5539beee1da783d0a313f,Tests_failed,15af0d73754b5ccdbce28a5c27a1096ed20f617b0e053a789824c3840d1a7dbc,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,0.025925159454345703,0.0280914306640625,0.02650761604309082,0.01854538917541504,0.029128313064575195,0.033614397048950195,0.02679157257080078,0.11139464378356934,0.10037803649902344,0.7550044059753418,0.5860507488250732,0.035210609436035156,0.0608212947845459,0.035886526107788086,0.06079554557800293,0.0607457160949707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,True,True,Tests_passed,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,True,17,61,468,2,True,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,True,17,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,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,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,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,d0ef0b1d652eb6dc1d9348dba30a724eb4e397afefc5539beee1da783d0a313f,Tests_failed,15af0d73754b5ccdbce28a5c27a1096ed20f617b0e053a789824c3840d1a7dbc,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,0.025925159454345703,0.0280914306640625,0.02650761604309082,0.01854538917541504,0.029128313064575195,0.033614397048950195,0.02679157257080078,0.11139464378356934,0.10037803649902344,0.7550044059753418,0.5860507488250732,0.035210609436035156,0.0608212947845459,0.035886526107788086,0.06079554557800293,0.0607457160949707,0.059046268463134766,0.05883955955505371,0.060649871826171875,0.05880618095397949,0.06050848960876465,0.059209346771240234,0.060501813888549805,0.09144353866577148,0.08862042427062988,0.751702070236206,0.615570068359375,0.05912637710571289,0.059313058853149414,0.05870413780212402,0.05884218215942383,0.05723166465759277 diff --git a/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv b/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv index 1b7f79be9e..2b2b191e8e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,False,True,3,25,79,2,True,3,Tests_passed,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,True,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,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,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,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,6e762185869a45ed6f455fc6604dfd346015bb5f551d8070550f0a748310b0c1,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,0.04303336143493652,0.04474186897277832,0.0574038028717041,0.01802682876586914,0.04700636863708496,0.05389547348022461,0.04616212844848633,0.1728227138519287,0.06926488876342773,0.9574501514434814,0.3625969886779785,0.037062883377075195,0.06307697296142578,0.03695082664489746,0.0630807876586914,0.061614990234375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,False,True,3,25,79,2,True,3,Tests_passed,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,True,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,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,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,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,6e762185869a45ed6f455fc6604dfd346015bb5f551d8070550f0a748310b0c1,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,0.04303336143493652,0.04474186897277832,0.0574038028717041,0.01802682876586914,0.04700636863708496,0.05389547348022461,0.04616212844848633,0.1728227138519287,0.06926488876342773,0.9574501514434814,0.3625969886779785,0.037062883377075195,0.06307697296142578,0.03695082664489746,0.0630807876586914,0.061614990234375,0.06205272674560547,0.06136679649353027,0.06460785865783691,0.0628044605255127,0.06018567085266113,0.06124162673950195,0.06140494346618652,0.09749841690063477,0.09172224998474121,1.0173335075378418,0.3809242248535156,0.06168341636657715,0.06037712097167969,0.058760881423950195,0.06022810935974121,0.06088089942932129 diff --git a/results/combined/merges_timed/ahome-it/lienzo-core.csv b/results/combined/merges_timed/ahome-it/lienzo-core.csv index 3fa289e109..49a864dc30 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,True,True,True,39,421,5543,2,True,39,Tests_passed,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,True,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,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,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,e537e2b1296f5bcbbd9434a937a50335f7ef84701e0bdebd8c3ca1527fa3598f,Tests_failed,09b1372f401221039588cd2f017ffb34ce8e190ede8992a6be1a3db8991d7f12,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,0.04841494560241699,0.04838371276855469,0.04666256904602051,0.04798460006713867,0.06575679779052734,0.054121971130371094,0.06087636947631836,0.2000596523284912,0.1323394775390625,0.8441038131713867,4.581540822982788,0.04857206344604492,0.07793569564819336,0.050409555435180664,0.07597923278808594,0.0819089412689209 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,True,True,True,39,421,5543,2,True,39,Tests_passed,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,True,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,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,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,e537e2b1296f5bcbbd9434a937a50335f7ef84701e0bdebd8c3ca1527fa3598f,Tests_failed,09b1372f401221039588cd2f017ffb34ce8e190ede8992a6be1a3db8991d7f12,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,Tests_failed,20e106351f6ca191ce9db7a95da16503f87d6e2b29f48b9e040a2b5b0ca9dcce,0.04841494560241699,0.04838371276855469,0.04666256904602051,0.04798460006713867,0.06575679779052734,0.054121971130371094,0.06087636947631836,0.2000596523284912,0.1323394775390625,0.8441038131713867,4.581540822982788,0.04857206344604492,0.07793569564819336,0.050409555435180664,0.07597923278808594,0.0819089412689209,0.07564973831176758,0.07761788368225098,0.07875967025756836,0.07965874671936035,0.08223462104797363,0.08036446571350098,0.08004117012023926,0.12237405776977539,0.11118268966674805,0.9671652317047119,4.773139476776123,0.07554006576538086,0.07999348640441895,0.08063340187072754,0.07862281799316406,0.07810258865356445 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 60d5763d4e..d812c2c0ee 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/remotes/origin/pull/126,21e89d1e201502c297cc8d03fae44c05bc51dfc4,98dd7f98f7ada6fbf3763e72a5c8498170ddab97,e5b220f1dff09d41d67719194b026555c620c592,,True,True,Tests_passed,429bb16fbb9c0e92ec28a971961e9100ff0eec66077fce7d1b811561d230582b,True,48,173,1191,3,True,Tests_passed,3691f73dc9c649ed52d230ac8d41ab2d3bfa5c0f997db0fa205fe13ca2f0d976,True,48,True,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,1faec877dbc5b7b05c524d7597f93607fede160a3a8f4f8a155f9ff15494db07,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,Tests_failed,bd498566ddf39241b13a4ef13fcb9032bc17bf9642a307756d0986aff0af61b1,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,a1a6ee882b8236ab5e400d8f302a8413201738d07d51fe8eff395dd9a000878c,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Tests_failed,0f2456c113c71e438154ea5188c5b11f447d1096712af331973f5d9e4aa96cb3,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,0.04816436767578125,0.05373859405517578,0.05527544021606445,0.019777297973632812,0.05809640884399414,0.04759621620178223,0.05447554588317871,0.2222135066986084,0.18268680572509766,0.035893917083740234,0.6096172332763672,0.06121182441711426,0.05800962448120117,0.06529736518859863,0.06304478645324707,0.06539607048034668 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/remotes/origin/pull/126,21e89d1e201502c297cc8d03fae44c05bc51dfc4,98dd7f98f7ada6fbf3763e72a5c8498170ddab97,e5b220f1dff09d41d67719194b026555c620c592,,True,True,Tests_passed,429bb16fbb9c0e92ec28a971961e9100ff0eec66077fce7d1b811561d230582b,True,48,173,1191,3,True,Tests_passed,3691f73dc9c649ed52d230ac8d41ab2d3bfa5c0f997db0fa205fe13ca2f0d976,True,48,True,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,1faec877dbc5b7b05c524d7597f93607fede160a3a8f4f8a155f9ff15494db07,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,Tests_failed,bd498566ddf39241b13a4ef13fcb9032bc17bf9642a307756d0986aff0af61b1,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,a1a6ee882b8236ab5e400d8f302a8413201738d07d51fe8eff395dd9a000878c,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Tests_failed,0f2456c113c71e438154ea5188c5b11f447d1096712af331973f5d9e4aa96cb3,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,0.04816436767578125,0.05373859405517578,0.05527544021606445,0.019777297973632812,0.05809640884399414,0.04759621620178223,0.05447554588317871,0.2222135066986084,0.18268680572509766,0.035893917083740234,0.6096172332763672,0.06121182441711426,0.05800962448120117,0.06529736518859863,0.06304478645324707,0.06539607048034668,0.06436872482299805,0.06297063827514648,0.06345486640930176,0.061727046966552734,0.06351947784423828,0.06429076194763184,0.06279706954956055,0.11372995376586914,0.14130616188049316,0.0798192024230957,0.7300736904144287,0.06384110450744629,0.06144523620605469,0.06483340263366699,0.05975770950317383,0.06401872634887695 diff --git a/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv b/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv index 007ba5a1c7..5a9b879d8b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,True,,Tests_passed,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,True,15,40,,2,True,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,True,15,True,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,6fa4425a207d7a60fd6f4cf8191feac7ca4ec501ae4d64426766a7268aa7e207,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,7aabce400372f86703c37f20140432ea3bc857aa46170df7b90bb1be859bd36a,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,78828a54e3cd8590beed8bdd6e66a63e07e98efddac74b13ddd0bda90b544d2d,Tests_failed,5e1d7644effee686f5faf21c22832b3b93cf7eefb1c5b8d2d287ecb6431e7365,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,0.008359432220458984,0.008524656295776367,0.00841379165649414,0.014129877090454102,0.008086919784545898,0.008294820785522461,0.00823211669921875,0.031957149505615234,0.06733465194702148,0.41270971298217773,0.42514848709106445,0.03918194770812988,0.041811466217041016,0.03896975517272949,0.041504859924316406,0.042101144790649414 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,True,,Tests_passed,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,True,15,40,,2,True,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,True,15,True,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,6fa4425a207d7a60fd6f4cf8191feac7ca4ec501ae4d64426766a7268aa7e207,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,7aabce400372f86703c37f20140432ea3bc857aa46170df7b90bb1be859bd36a,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,78828a54e3cd8590beed8bdd6e66a63e07e98efddac74b13ddd0bda90b544d2d,Tests_failed,5e1d7644effee686f5faf21c22832b3b93cf7eefb1c5b8d2d287ecb6431e7365,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,0.008359432220458984,0.008524656295776367,0.00841379165649414,0.014129877090454102,0.008086919784545898,0.008294820785522461,0.00823211669921875,0.031957149505615234,0.06733465194702148,0.41270971298217773,0.42514848709106445,0.03918194770812988,0.041811466217041016,0.03896975517272949,0.041504859924316406,0.042101144790649414,0.041347503662109375,0.03943443298339844,0.04030585289001465,0.04077887535095215,0.03983497619628906,0.03956151008605957,0.040697574615478516,0.07254576683044434,0.07636523246765137,0.4744298458099365,0.4848599433898926,0.04068732261657715,0.04024648666381836,0.04063081741333008,0.040465354919433594,0.04096555709838867 diff --git a/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv b/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv index 2825790514..206c826441 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,True,103,168,6423,4,True,103,Tests_passed,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,True,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,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,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,35db782d5a3d433ebb8e7e2febea4e8541918c5ee2b7652e1c53db5b3f880508,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,0.012655258178710938,0.012688636779785156,0.013115406036376953,0.019977807998657227,0.013622760772705078,0.01370096206665039,0.013699769973754883,0.051129817962646484,0.07194709777832031,0.01580023765563965,1.1894810199737549,0.0632174015045166,0.0659024715423584,0.06674432754516602,0.07593822479248047,0.07657766342163086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,True,103,168,6423,4,True,103,Tests_passed,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,True,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,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,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,35db782d5a3d433ebb8e7e2febea4e8541918c5ee2b7652e1c53db5b3f880508,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,6cafe0966cf17b1ca0be730c3616bc68159250c735a0cb4ecb4202b08597e8cb,Merge_failed,dc38cee318f720cceb52ac5c02517982db0c8c19a42c5a704baef318e2b1fac5,0.012655258178710938,0.012688636779785156,0.013115406036376953,0.019977807998657227,0.013622760772705078,0.01370096206665039,0.013699769973754883,0.051129817962646484,0.07194709777832031,0.01580023765563965,1.1894810199737549,0.0632174015045166,0.0659024715423584,0.06674432754516602,0.07593822479248047,0.07657766342163086,0.0722508430480957,0.07190632820129395,0.07467389106750488,0.07407045364379883,0.07235836982727051,0.07361507415771484,0.07429623603820801,0.12117266654968262,0.10578560829162598,0.08475565910339355,1.2727110385894775,0.07224178314208984,0.07508444786071777,0.07170581817626953,0.07272219657897949,0.07301521301269531 diff --git a/results/combined/merges_timed/alexruiz/fest-util.csv b/results/combined/merges_timed/alexruiz/fest-util.csv index c697aa682a..370bb5a1d9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,True,True,True,19,83,452,2,True,19,Tests_passed,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,True,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,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,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,786e1a43d0ecb49beecb8ba46836fbb83e4b77b0450e47f19bfd976e14f555b3,Tests_passed,c8eade2ddfc4a7752917324a03446a94f27687ae677565f3534a59ce94a60744,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,0.041092872619628906,0.04371070861816406,0.042133331298828125,0.015699386596679688,0.011235713958740234,0.036446332931518555,0.04188203811645508,0.17110371589660645,0.12440967559814453,0.5714268684387207,0.3770260810852051,0.04984283447265625,0.05729508399963379,0.0425724983215332,0.057507991790771484,0.05665993690490723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,True,True,True,19,83,452,2,True,19,Tests_passed,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,True,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,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,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,786e1a43d0ecb49beecb8ba46836fbb83e4b77b0450e47f19bfd976e14f555b3,Tests_passed,c8eade2ddfc4a7752917324a03446a94f27687ae677565f3534a59ce94a60744,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,Tests_passed,99ea80320b350f9a868a4143f5555f32a58dcd4769f3281d4b309964d21d1502,0.041092872619628906,0.04371070861816406,0.042133331298828125,0.015699386596679688,0.011235713958740234,0.036446332931518555,0.04188203811645508,0.17110371589660645,0.12440967559814453,0.5714268684387207,0.3770260810852051,0.04984283447265625,0.05729508399963379,0.0425724983215332,0.057507991790771484,0.05665993690490723,0.05640530586242676,0.05617403984069824,0.05657482147216797,0.05569005012512207,0.05602121353149414,0.05467033386230469,0.05503249168395996,0.08546662330627441,0.09383845329284668,0.5912139415740967,0.43177056312561035,0.05574297904968262,0.05529642105102539,0.05593132972717285,0.05676698684692383,0.055028676986694336 diff --git a/results/combined/merges_timed/alexxiyang/shiro-redis.csv b/results/combined/merges_timed/alexxiyang/shiro-redis.csv index e9d262916e..2d83b62cbf 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,True,True,Tests_passed,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,True,16,101,1012,3,True,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,True,16,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,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,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,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,8df051d573d5e296b740c3fc33a90fe23bf9f2ae734e8ed8c17642a097fd2bd7,Tests_failed,d54b47abbc47cc1fb6a356d87d0510a12080bf90b784809dc8728c3c447e3ebd,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,0.05762004852294922,0.04317760467529297,0.049735069274902344,0.02119159698486328,0.06081414222717285,0.04341006278991699,0.044286489486694336,0.2510559558868408,0.18559026718139648,1.3062961101531982,0.5916519165039062,0.04037070274353027,0.0805048942565918,0.041181325912475586,0.0822911262512207,0.08228611946105957 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,True,True,Tests_passed,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,True,16,101,1012,3,True,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,True,16,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,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,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,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,8df051d573d5e296b740c3fc33a90fe23bf9f2ae734e8ed8c17642a097fd2bd7,Tests_failed,d54b47abbc47cc1fb6a356d87d0510a12080bf90b784809dc8728c3c447e3ebd,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,0.05762004852294922,0.04317760467529297,0.049735069274902344,0.02119159698486328,0.06081414222717285,0.04341006278991699,0.044286489486694336,0.2510559558868408,0.18559026718139648,1.3062961101531982,0.5916519165039062,0.04037070274353027,0.0805048942565918,0.041181325912475586,0.0822911262512207,0.08228611946105957,0.07818436622619629,0.07896780967712402,0.07955169677734375,0.08226227760314941,0.08022212982177734,0.08122825622558594,0.08197498321533203,0.13080239295959473,0.1334996223449707,1.3324801921844482,0.6221833229064941,0.07880115509033203,0.0821230411529541,0.08077859878540039,0.07806825637817383,0.07851934432983398 diff --git a/results/combined/merges_timed/alibaba/canal.csv b/results/combined/merges_timed/alibaba/canal.csv index 1c77ca9bb9..ff57230ba7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,True,7,15,48.0,2,True,7,Tests_passed,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,True,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.035300493240356445,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.12026858329772949,1.124190330505371,0.5638904571533203,0.03819990158081055,0.0685889720916748,0.08070564270019531,0.06711196899414062,0.06551289558410645 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,True,7,15,48.0,2,True,7,Tests_passed,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,True,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.035300493240356445,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.12026858329772949,1.124190330505371,0.5638904571533203,0.03819990158081055,0.0685889720916748,0.08070564270019531,0.06711196899414062,0.06551289558410645,0.06310176849365234,0.10237979888916016,0.0673670768737793,0.06761384010314941,0.06323981285095215,0.10982203483581543,0.06811404228210449,0.1020054817199707,0.0976262092590332,1.1374149322509766,0.6013188362121582,0.06519508361816406,0.06589460372924805,0.06484866142272949,0.10844135284423828,0.06381559371948242 diff --git a/results/combined/merges_timed/alibaba/easyexcel.csv b/results/combined/merges_timed/alibaba/easyexcel.csv index ba7332ac9c..e6bf0e85c9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,True,160,784,4550,2,True,160,Tests_passed,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,True,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,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,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Tests_failed,5bb4bddf6027d86cb8e4e2704376d001771a271e403399a9e360198d1df00060,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,e2339705bde973b730bfe0d07b7db97d43df6020879c1f98eb77868713372642,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,a7a8102e58f3d87fb7400126feb76c1d8c093a12cb334c6d3f6ad1571d5b76c0,Tests_failed,4fa33cc0e468046d4af6ff3c062354db745b7098306844cc83f1fb2c7f854e9c,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.03529524803161621,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.08147931098937988,1.1937737464904785,3.2110533714294434,0.06790018081665039,0.06540799140930176,0.06665420532226562,0.06885433197021484,0.06786608695983887 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,True,160,784,4550,2,True,160,Tests_passed,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,True,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,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,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Tests_failed,5bb4bddf6027d86cb8e4e2704376d001771a271e403399a9e360198d1df00060,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,e2339705bde973b730bfe0d07b7db97d43df6020879c1f98eb77868713372642,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,a7a8102e58f3d87fb7400126feb76c1d8c093a12cb334c6d3f6ad1571d5b76c0,Tests_failed,4fa33cc0e468046d4af6ff3c062354db745b7098306844cc83f1fb2c7f854e9c,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.03529524803161621,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.08147931098937988,1.1937737464904785,3.2110533714294434,0.06790018081665039,0.06540799140930176,0.06665420532226562,0.06885433197021484,0.06786608695983887,0.06400036811828613,0.06499385833740234,0.06896066665649414,0.06788158416748047,0.06691813468933105,0.06597065925598145,0.06512784957885742,0.10484719276428223,0.1051015853881836,1.26987886428833,3.3631508350372314,0.06770992279052734,0.06586313247680664,0.06364560127258301,0.06512594223022461,0.06577301025390625 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 9f1bd87eb6..aa5f49b6d7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,True,14,46,139,2,True,14,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,True,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,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,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,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_failed,07a3b3bdfe0be3a3e6068d7f9d656704ba107566dfd2299dde162da085e3df69,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,0.009243249893188477,0.009147167205810547,0.009952545166015625,0.01634836196899414,0.010038614273071289,0.010265350341796875,0.010042667388916016,0.033628225326538086,0.010112762451171875,0.013350725173950195,0.3961646556854248,0.03175997734069824,0.03833746910095215,0.0319516658782959,0.03890180587768555,0.04009246826171875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,True,14,46,139,2,True,14,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,True,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,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,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,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_failed,07a3b3bdfe0be3a3e6068d7f9d656704ba107566dfd2299dde162da085e3df69,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,0.009243249893188477,0.009147167205810547,0.009952545166015625,0.01634836196899414,0.010038614273071289,0.010265350341796875,0.010042667388916016,0.033628225326538086,0.010112762451171875,0.013350725173950195,0.3961646556854248,0.03175997734069824,0.03833746910095215,0.0319516658782959,0.03890180587768555,0.04009246826171875,0.039937496185302734,0.038776397705078125,0.039731502532958984,0.04008173942565918,0.042014360427856445,0.04030156135559082,0.04119110107421875,0.0682830810546875,0.047979116439819336,0.0538172721862793,0.4202885627746582,0.039988040924072266,0.039569854736328125,0.03932595252990723,0.039969682693481445,0.036936283111572266 diff --git a/results/combined/merges_timed/allanbank/mongodb-async-driver.csv b/results/combined/merges_timed/allanbank/mongodb-async-driver.csv index a1cc96f669..8290af60a9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,True,91,331,7744,4,True,91,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,True,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,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,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,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,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,d1177034a2f4bbb946ca58d86f303dfa6008fc86f33684ee094154d06366002b,Tests_failed,9692946d66077f16bc3c7f90194de983e564cc8daf5ef2bb51b39b00c7dd4072,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,0.024473905563354492,0.12476921081542969,0.09948611259460449,0.03921818733215332,0.09874820709228516,0.15170955657958984,0.10056066513061523,0.14546489715576172,0.18889570236206055,2.9220919609069824,2.629531145095825,0.06609797477722168,0.14327645301818848,0.0669100284576416,0.14327526092529297,0.14165067672729492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,True,91,331,7744,4,True,91,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,True,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,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,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,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,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,d1177034a2f4bbb946ca58d86f303dfa6008fc86f33684ee094154d06366002b,Tests_failed,9692946d66077f16bc3c7f90194de983e564cc8daf5ef2bb51b39b00c7dd4072,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,0.024473905563354492,0.12476921081542969,0.09948611259460449,0.03921818733215332,0.09874820709228516,0.15170955657958984,0.10056066513061523,0.14546489715576172,0.18889570236206055,2.9220919609069824,2.629531145095825,0.06609797477722168,0.14327645301818848,0.0669100284576416,0.14327526092529297,0.14165067672729492,0.1365358829498291,0.14166665077209473,0.19608783721923828,0.14221644401550293,0.14299750328063965,0.14458966255187988,0.1479029655456543,0.23223090171813965,0.23166942596435547,3.607947587966919,3.0742909908294678,0.1390857696533203,0.1408064365386963,0.13736820220947266,0.14271020889282227,0.1403369903564453 diff --git a/results/combined/merges_timed/amplafi/htmlcleaner.csv b/results/combined/merges_timed/amplafi/htmlcleaner.csv index e01edf0501..a144db19df 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,True,True,True,32,290,1968,2,True,32,Tests_passed,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,True,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,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,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,9266dc0a98e9c8ab58751141948ed44096d538c4ec74f40c10f8d43c3a8a3fdf,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,0.05621814727783203,0.07178449630737305,0.052436113357543945,0.0251467227935791,0.04867362976074219,0.04696011543273926,0.04081106185913086,0.1931743621826172,0.12928199768066406,1.2498857975006104,1.1974546909332275,0.0474085807800293,0.07517576217651367,0.04761767387390137,0.07482218742370605,0.07613372802734375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,True,True,True,32,290,1968,2,True,32,Tests_passed,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,True,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,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,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,9266dc0a98e9c8ab58751141948ed44096d538c4ec74f40c10f8d43c3a8a3fdf,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,fda1d0b2d5cb9947186a80ef5b89b6ece97c1d52465fc6c37d44ab44e2fec3ea,Tests_passed,87a2d1e52d7deddcc9f8cdd34016b9cc7bc7a98033189a33198ce6f0a4dc7fac,0.05621814727783203,0.07178449630737305,0.052436113357543945,0.0251467227935791,0.04867362976074219,0.04696011543273926,0.04081106185913086,0.1931743621826172,0.12928199768066406,1.2498857975006104,1.1974546909332275,0.0474085807800293,0.07517576217651367,0.04761767387390137,0.07482218742370605,0.07613372802734375,0.07544708251953125,0.07268238067626953,0.07543325424194336,0.07696032524108887,0.07433199882507324,0.07342290878295898,0.07580423355102539,0.11170530319213867,0.1092081069946289,1.2848403453826904,1.252607822418213,0.07466602325439453,0.0722658634185791,0.07197380065917969,0.07131838798522949,0.07288765907287598 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 4ef7116c78..dc2e68aa5c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,True,True,Tests_passed,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,True,16,42,4014,8,True,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,True,16,True,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,e5573efae466ccc37ba93824f6ae7c87fa318908b9bcd9da0ca7683c4f3c1d93,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,Merge_failed,6e8ce100abe58d80ef2c741a21ba4a6f15518a9c43a474589cd5fa6a424e409e,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,37ef17ac78ad3a6b3bf07d4b44640c9e038c783ff91a87cf21ca3d4256a48842,Merge_failed,ae8765903dc1b794ca60575050813050947d39dc30766033e5f7e0fcbb17d4e5,Merge_failed,c057e4c1f238f36b79b2f8d31f4a43d2f3140bef9ecc60f5eb381e937a37f771,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,0.009391546249389648,0.009483814239501953,0.00881505012512207,0.014920711517333984,0.008917808532714844,0.00906515121459961,0.00924539566040039,0.08899831771850586,0.23643279075622559,0.5392460823059082,0.37575197219848633,0.09930038452148438,0.09832215309143066,0.0979769229888916,0.09920287132263184,0.10023021697998047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,True,True,Tests_passed,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,True,16,42,4014,8,True,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,True,16,True,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,e5573efae466ccc37ba93824f6ae7c87fa318908b9bcd9da0ca7683c4f3c1d93,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,Merge_failed,6e8ce100abe58d80ef2c741a21ba4a6f15518a9c43a474589cd5fa6a424e409e,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,37ef17ac78ad3a6b3bf07d4b44640c9e038c783ff91a87cf21ca3d4256a48842,Merge_failed,ae8765903dc1b794ca60575050813050947d39dc30766033e5f7e0fcbb17d4e5,Merge_failed,c057e4c1f238f36b79b2f8d31f4a43d2f3140bef9ecc60f5eb381e937a37f771,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,6cfc38d88eef6a099bdc165571a8ff71bfed22cbf45dcc4b17a68e8ec226df0c,Merge_failed,aa5460437ee3db40d01b2106745032074b625140098888318ec6cb953ae9d613,0.009391546249389648,0.009483814239501953,0.00881505012512207,0.014920711517333984,0.008917808532714844,0.00906515121459961,0.00924539566040039,0.08899831771850586,0.23643279075622559,0.5392460823059082,0.37575197219848633,0.09930038452148438,0.09832215309143066,0.0979769229888916,0.09920287132263184,0.10023021697998047,0.10028600692749023,0.09856605529785156,0.09981489181518555,0.10068225860595703,0.10114431381225586,0.09760642051696777,0.09944581985473633,0.21239209175109863,0.23035860061645508,0.7155678272247314,0.5303139686584473,0.10222625732421875,0.10071611404418945,0.09970450401306152,0.10019302368164062,0.09939455986022949 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 db56c69547..ccc1d4d73b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,False,True,3,5,45,4,True,4,Tests_passed,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,True,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,True,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,aadf2b6538766a44b8533fad3730cf113cb983564618533d1f942129f1364b29,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,Merge_failed,e2e94ad9a25ccdc8a15fef249330bb7ffaa8614f48e818f9f72e569378b58e63,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,0d6e33af487ede8cc7335a4ca29d3a93d10a46e1a36dcbc0bf542eb0057a84b5,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,19c545dac206286d257ef1c922a3a60ec2e2b7cf60596ae2c639c3a4085b81b7,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,0.08356785774230957,0.03633999824523926,0.03760123252868652,0.05972409248352051,0.035610198974609375,0.10135698318481445,0.09868884086608887,0.2962057590484619,0.20772552490234375,0.613436222076416,0.3527991771697998,0.19366693496704102,0.0915231704711914,0.1647803783416748,0.11317110061645508,0.15619874000549316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,False,True,3,5,45,4,True,4,Tests_passed,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,True,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,True,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,aadf2b6538766a44b8533fad3730cf113cb983564618533d1f942129f1364b29,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,Merge_failed,e2e94ad9a25ccdc8a15fef249330bb7ffaa8614f48e818f9f72e569378b58e63,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,0d6e33af487ede8cc7335a4ca29d3a93d10a46e1a36dcbc0bf542eb0057a84b5,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,19c545dac206286d257ef1c922a3a60ec2e2b7cf60596ae2c639c3a4085b81b7,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,0.08356785774230957,0.03633999824523926,0.03760123252868652,0.05972409248352051,0.035610198974609375,0.10135698318481445,0.09868884086608887,0.2962057590484619,0.20772552490234375,0.613436222076416,0.3527991771697998,0.19366693496704102,0.0915231704711914,0.1647803783416748,0.11317110061645508,0.15619874000549316,0.16031885147094727,0.12628388404846191,0.17946791648864746,0.09119772911071777,0.1652364730834961,0.09679555892944336,0.1675093173980713,0.14803814888000488,0.2855846881866455,0.8804049491882324,0.3980143070220947,0.15653705596923828,0.15970277786254883,0.1555941104888916,0.12009358406066895,0.1517791748046875 diff --git a/results/combined/merges_timed/andrewphorn/classicube-client.csv b/results/combined/merges_timed/andrewphorn/classicube-client.csv index 17e1725f48..0617c636bb 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,Tests_passed,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,True,20,32,166,2,True,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,True,20,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,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,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,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,caa2d9b0b823058decbfe12b088c35da4d5093b77e116664165bd609a3190cf3,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,0.0552675724029541,0.04412388801574707,0.04626107215881348,0.03495931625366211,0.06342291831970215,0.056456565856933594,0.05805253982543945,0.20055794715881348,0.11186337471008301,2.668989419937134,0.8294899463653564,0.038735151290893555,0.07632064819335938,0.037836313247680664,0.0885171890258789,0.09832978248596191 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,Tests_passed,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,True,20,32,166,2,True,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,True,20,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,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,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,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,caa2d9b0b823058decbfe12b088c35da4d5093b77e116664165bd609a3190cf3,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,0.0552675724029541,0.04412388801574707,0.04626107215881348,0.03495931625366211,0.06342291831970215,0.056456565856933594,0.05805253982543945,0.20055794715881348,0.11186337471008301,2.668989419937134,0.8294899463653564,0.038735151290893555,0.07632064819335938,0.037836313247680664,0.0885171890258789,0.09832978248596191,0.06913137435913086,0.07074737548828125,0.08106088638305664,0.10293412208557129,0.09835433959960938,0.10089540481567383,0.07455754280090332,0.10567450523376465,0.10290884971618652,2.721693277359009,0.7961933612823486,0.09508681297302246,0.09594202041625977,0.09428238868713379,0.07102537155151367,0.07130932807922363 diff --git a/results/combined/merges_timed/andygibson/datafactory.csv b/results/combined/merges_timed/andygibson/datafactory.csv index 5dc1b0663d..58073c2f88 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,True,6,9,331,3,True,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,True,6,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,a332a8c1b78cae5b6c2cc929a757877f86e3386b3af40645d61b8044431da7e1,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Tests_failed,58b5d34278d52caba6cc75a593c7796db7cea203292308b1d1b7d68ebb45120c,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,52da586a8dbf5742ce51212b21ad82cd13f9b548e28e48d633c70f5a0da63258,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,6e49367cd98dd5da6d905bb21d668b4436b3ae90a9da6ed310419cd0246d1181,Tests_failed,60e7c1ffc7b392beaa1b2b7e99245e44a18cd2a75b79257d69b34a314362ebf6,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,0.0393064022064209,0.0382235050201416,0.0402829647064209,0.013096332550048828,0.04092812538146973,0.03896450996398926,0.0423121452331543,0.22737479209899902,0.17236018180847168,1.4844064712524414,0.33509087562561035,0.040790557861328125,0.06121993064880371,0.04088783264160156,0.06076955795288086,0.061193227767944336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,True,6,9,331,3,True,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,True,6,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,a332a8c1b78cae5b6c2cc929a757877f86e3386b3af40645d61b8044431da7e1,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Tests_failed,58b5d34278d52caba6cc75a593c7796db7cea203292308b1d1b7d68ebb45120c,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,52da586a8dbf5742ce51212b21ad82cd13f9b548e28e48d633c70f5a0da63258,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,6e49367cd98dd5da6d905bb21d668b4436b3ae90a9da6ed310419cd0246d1181,Tests_failed,60e7c1ffc7b392beaa1b2b7e99245e44a18cd2a75b79257d69b34a314362ebf6,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,0.0393064022064209,0.0382235050201416,0.0402829647064209,0.013096332550048828,0.04092812538146973,0.03896450996398926,0.0423121452331543,0.22737479209899902,0.17236018180847168,1.4844064712524414,0.33509087562561035,0.040790557861328125,0.06121993064880371,0.04088783264160156,0.06076955795288086,0.061193227767944336,0.06015300750732422,0.0602107048034668,0.05768942832946777,0.058008670806884766,0.05833005905151367,0.05917668342590332,0.057616472244262695,0.10373067855834961,0.11745834350585938,1.54707932472229,0.39928579330444336,0.05896615982055664,0.05959630012512207,0.057816505432128906,0.0574488639831543,0.058272600173950195 diff --git a/results/combined/merges_timed/anjuke/hwi.csv b/results/combined/merges_timed/anjuke/hwi.csv index 378ea578e3..0fb4d528a9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,True,True,Tests_passed,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,True,7,34,193,2,True,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,True,7,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,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,c04c6a895b352c628059ba6eb21bca2362735a05de725fd3458f82f439e52138,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,0.011649370193481445,0.011630535125732422,0.013501644134521484,0.02268385887145996,0.014083147048950195,0.014062881469726562,0.014121055603027344,0.03943634033203125,0.06658172607421875,0.8354017734527588,0.340930700302124,0.039920806884765625,0.06645536422729492,0.0399782657623291,0.06754779815673828,0.06659650802612305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,True,True,Tests_passed,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,True,7,34,193,2,True,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,True,7,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,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,c04c6a895b352c628059ba6eb21bca2362735a05de725fd3458f82f439e52138,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,Tests_passed,8c3df0c68578144b9bf6f9517285b19b2675d3c0e1acb88e343e701f5a0e7217,0.011649370193481445,0.011630535125732422,0.013501644134521484,0.02268385887145996,0.014083147048950195,0.014062881469726562,0.014121055603027344,0.03943634033203125,0.06658172607421875,0.8354017734527588,0.340930700302124,0.039920806884765625,0.06645536422729492,0.0399782657623291,0.06754779815673828,0.06659650802612305,0.06657838821411133,0.0662388801574707,0.0655970573425293,0.06785058975219727,0.06728792190551758,0.06653881072998047,0.06492757797241211,0.1031494140625,0.09699487686157227,0.9391310214996338,0.3896501064300537,0.06521487236022949,0.06581401824951172,0.0641775131225586,0.06365394592285156,0.06424331665039062 diff --git a/results/combined/merges_timed/antlr/grammars-v4.csv b/results/combined/merges_timed/antlr/grammars-v4.csv index 27eac6341d..633f89fd38 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,True,5,41,157.0,3,True,5,Tests_passed,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,True,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,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,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,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,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.030353307723999023,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.20019221305847168,0.06107497215270996,0.36704516410827637,0.05783796310424805,0.10835504531860352,0.05841326713562012,0.10548162460327148,0.1090095043182373 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,True,5,41,157.0,3,True,5,Tests_passed,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,True,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,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,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,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,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.030353307723999023,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.20019221305847168,0.06107497215270996,0.36704516410827637,0.05783796310424805,0.10835504531860352,0.05841326713562012,0.10548162460327148,0.1090095043182373,0.10249948501586914,0.1000978946685791,0.10463213920593262,0.1057119369506836,0.10503411293029785,0.10517048835754395,0.10676836967468262,0.17560648918151855,0.15594244003295898,0.11807894706726074,0.4052433967590332,0.10313773155212402,0.10150861740112305,0.09981298446655273,0.10021352767944336,0.1015317440032959 diff --git a/results/combined/merges_timed/apache/accumulo.csv b/results/combined/merges_timed/apache/accumulo.csv index 1a1de3d105..d37f993df9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,True,True,True,1012,7273,128524,2,True,1011,Tests_passed,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,True,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,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,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,b679316bbbcdc5c98d92b60a46d7c28b81957aa980b4156ef25bf7a3c54f9410,Merge_failed,897fde24f602d3f1c91600bda652c8fec6b8c5fa8c556219aeacdfe5820a872e,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_timedout,,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,0.1207878589630127,0.12068510055541992,0.19636869430541992,0.21262383460998535,0.19556069374084473,0.1944572925567627,0.1965503692626953,0.2829322814941406,0.18050026893615723,0.1253185272216797,-1.0,0.21863603591918945,0.2575535774230957,0.22815489768981934,0.26366257667541504,0.26075053215026855 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,True,True,True,1012,7273,128524,2,True,1011,Tests_passed,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,True,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,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,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,b679316bbbcdc5c98d92b60a46d7c28b81957aa980b4156ef25bf7a3c54f9410,Merge_failed,897fde24f602d3f1c91600bda652c8fec6b8c5fa8c556219aeacdfe5820a872e,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_timedout,,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,Merge_failed,07a73a82ae0c2fec98169a70023072dbed84901509044899bc8efa29b58831aa,0.1207878589630127,0.12068510055541992,0.19636869430541992,0.21262383460998535,0.19556069374084473,0.1944572925567627,0.1965503692626953,0.2829322814941406,0.18050026893615723,0.1253185272216797,-1.0,0.21863603591918945,0.2575535774230957,0.22815489768981934,0.26366257667541504,0.26075053215026855,0.2481677532196045,0.25162458419799805,0.3235030174255371,0.32460689544677734,0.32769012451171875,0.3247532844543457,0.32821059226989746,0.3391835689544678,0.34510350227355957,0.3114778995513916,-1.0,0.24446439743041992,0.2523922920227051,0.24845647811889648,0.24573445320129395,0.24776911735534668 diff --git a/results/combined/merges_timed/apache/avro.csv b/results/combined/merges_timed/apache/avro.csv index 6d9855b092..307069e520 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,,Tests_passed,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,True,374.0,488,,8,True,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,True,380,True,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,a04291eda8f9bded4adece06dfa4c0c3bea0dc06b13be3d3328c829f528bc14a,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,85a23c9acb9f5ff2f0173effe5287858536b5b365d93375801963fca97558575,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Tests_failed,881e836bd78aafc1634306998b1cefa8fc8402dce612d0169c341e5a8ea3a73e,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,0.034218788146972656,0.027122020721435547,0.05997204780578613,0.046698570251464844,0.054755210876464844,0.06560945510864258,0.050069332122802734,0.2211301326751709,0.12684416770935059,1.2738161087036133,0.8964769840240479,0.06936025619506836,0.07901215553283691,0.07062435150146484,0.07893896102905273,0.07825565338134766 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,,Tests_passed,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,True,374.0,488,,8,True,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,True,380,True,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,a04291eda8f9bded4adece06dfa4c0c3bea0dc06b13be3d3328c829f528bc14a,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,85a23c9acb9f5ff2f0173effe5287858536b5b365d93375801963fca97558575,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Tests_failed,881e836bd78aafc1634306998b1cefa8fc8402dce612d0169c341e5a8ea3a73e,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,0.034218788146972656,0.027122020721435547,0.05997204780578613,0.046698570251464844,0.054755210876464844,0.06560945510864258,0.050069332122802734,0.2211301326751709,0.12684416770935059,1.2738161087036133,0.8964769840240479,0.06936025619506836,0.07901215553283691,0.07062435150146484,0.07893896102905273,0.07825565338134766,0.07764863967895508,0.07300424575805664,0.08818721771240234,0.0871419906616211,0.08412742614746094,0.08408999443054199,0.08624815940856934,0.11760544776916504,0.1189112663269043,1.2449641227722168,0.9354536533355713,0.07480382919311523,0.07568001747131348,0.07563161849975586,0.07519078254699707,0.07397603988647461 diff --git a/results/combined/merges_timed/apache/cayenne.csv b/results/combined/merges_timed/apache/cayenne.csv index d8d7a07e71..05ef0345f5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,True,8,22,55,2,True,8,Tests_passed,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,True,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,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_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,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_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,f62fe7b0b2ac62158bc2ad4380d351af1db618e3c4af4dc09bf99c8724d8f3c7,Tests_passed,b0e3f7cbeeef1e059d6c783bf8b47425861d5d97f4bdfbefef402a15f9c6dbc4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,0.08471107482910156,0.09049034118652344,0.09269452095031738,0.03615617752075195,0.09391093254089355,0.09704351425170898,0.09974336624145508,0.21252989768981934,0.1510906219482422,1.2483057975769043,0.6258819103240967,0.06984996795654297,0.09699130058288574,0.06824064254760742,0.09464192390441895,0.0975942611694336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,True,8,22,55,2,True,8,Tests_passed,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,True,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,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_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,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_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,f62fe7b0b2ac62158bc2ad4380d351af1db618e3c4af4dc09bf99c8724d8f3c7,Tests_passed,b0e3f7cbeeef1e059d6c783bf8b47425861d5d97f4bdfbefef402a15f9c6dbc4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,0.08471107482910156,0.09049034118652344,0.09269452095031738,0.03615617752075195,0.09391093254089355,0.09704351425170898,0.09974336624145508,0.21252989768981934,0.1510906219482422,1.2483057975769043,0.6258819103240967,0.06984996795654297,0.09699130058288574,0.06824064254760742,0.09464192390441895,0.0975942611694336,0.09289097785949707,0.09122276306152344,0.09438610076904297,0.09703636169433594,0.09587264060974121,0.09556317329406738,0.09348607063293457,0.14992189407348633,0.13169097900390625,1.2218153476715088,0.6765940189361572,0.09196186065673828,0.09008264541625977,0.09239959716796875,0.0876619815826416,0.09028053283691406 diff --git a/results/combined/merges_timed/apache/commons-bcel.csv b/results/combined/merges_timed/apache/commons-bcel.csv index 9a22e24c29..b3767ee4db 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -73,refs/remotes/origin/pull/27,38d50ba679622dbbfcbc835fbd4652d2bbde4f56,fdae273276026590f67009c7119db47a98b7153a,7cfc47ce577a43719617164f2234c5253638035b,,True,,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,True,382,483,,3,True,Tests_passed,f605eb87ad553734dee8608c3558e60d82a26f1e8494bb8884fd3a10a1612ec7,True,382,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,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_failed,7724caa28663198d6820381782ebf280de61e18b0b18f2beb32e89c5de340e98,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,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,c68aba0e15afeda0c50bb2898db316748453e2cbc50f9ec334b1c67b0085dc4a,Tests_failed,7724caa28663198d6820381782ebf280de61e18b0b18f2beb32e89c5de340e98,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,0.037090301513671875,0.04035687446594238,0.053708791732788086,0.05335235595703125,0.06043076515197754,0.062462806701660156,0.058457136154174805,0.23001742362976074,0.15451407432556152,1.248809576034546,4.501599073410034,0.08374261856079102,0.14081120491027832,0.08938145637512207,0.13602685928344727,0.13680291175842285 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +73,refs/remotes/origin/pull/27,38d50ba679622dbbfcbc835fbd4652d2bbde4f56,fdae273276026590f67009c7119db47a98b7153a,7cfc47ce577a43719617164f2234c5253638035b,,True,,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,True,382,483,,3,True,Tests_passed,f605eb87ad553734dee8608c3558e60d82a26f1e8494bb8884fd3a10a1612ec7,True,382,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,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_failed,7724caa28663198d6820381782ebf280de61e18b0b18f2beb32e89c5de340e98,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,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,c68aba0e15afeda0c50bb2898db316748453e2cbc50f9ec334b1c67b0085dc4a,Tests_failed,7724caa28663198d6820381782ebf280de61e18b0b18f2beb32e89c5de340e98,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,0.037090301513671875,0.04035687446594238,0.053708791732788086,0.05335235595703125,0.06043076515197754,0.062462806701660156,0.058457136154174805,0.23001742362976074,0.15451407432556152,1.248809576034546,4.501599073410034,0.08374261856079102,0.14081120491027832,0.08938145637512207,0.13602685928344727,0.13680291175842285,0.12811279296875,0.13346362113952637,0.13666534423828125,0.1374223232269287,0.13880681991577148,0.1418318748474121,0.14266014099121094,0.20769929885864258,0.19416189193725586,1.3671886920928955,4.0426623821258545,0.1301865577697754,0.12903141975402832,0.13253331184387207,0.12583303451538086,0.13281488418579102 diff --git a/results/combined/merges_timed/apache/commons-beanutils.csv b/results/combined/merges_timed/apache/commons-beanutils.csv index a8bc11429f..00d4b837f7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,201,1574,4281.0,2,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,201,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,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a82f6d514dc46ea4f94bf729a30f541db9c0139f400c024aa8adb536013192b6,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Tests_failed,cd9708d52ccfd96b1ce9ef9382cf7b0a32c762eb12f64175d1b47ccad4d50e77,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.04464840888977051,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.10025286674499512,1.359971046447754,3.008755683898926,0.08381438255310059,0.07603120803833008,0.07501959800720215,0.07505989074707031,0.07429099082946777 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,201,1574,4281.0,2,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,201,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,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,a82f6d514dc46ea4f94bf729a30f541db9c0139f400c024aa8adb536013192b6,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Tests_failed,cd9708d52ccfd96b1ce9ef9382cf7b0a32c762eb12f64175d1b47ccad4d50e77,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.04464840888977051,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.10025286674499512,1.359971046447754,3.008755683898926,0.08381438255310059,0.07603120803833008,0.07501959800720215,0.07505989074707031,0.07429099082946777,0.07387566566467285,0.07292699813842773,0.07717156410217285,0.08649396896362305,0.0821986198425293,0.08847999572753906,0.07856988906860352,0.11919260025024414,0.11980772018432617,1.654104232788086,2.893493175506592,0.07412481307983398,0.07668495178222656,0.07764077186584473,0.08232283592224121,0.07364034652709961 diff --git a/results/combined/merges_timed/apache/commons-codec.csv b/results/combined/merges_timed/apache/commons-codec.csv index 0f158a18ea..5831aa6d32 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,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,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,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,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.018458127975463867,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.11384201049804688,0.02704334259033203,0.4569263458251953,0.13575983047485352,0.11831998825073242,0.09277033805847168,0.11937999725341797,0.11068582534790039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,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,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,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,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.018458127975463867,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.11384201049804688,0.02704334259033203,0.4569263458251953,0.13575983047485352,0.11831998825073242,0.09277033805847168,0.11937999725341797,0.11068582534790039,0.061895132064819336,0.1270735263824463,0.14513659477233887,0.13723087310791016,0.13067126274108887,0.14682888984680176,0.14347052574157715,0.1648247241973877,0.1315147876739502,0.13028597831726074,0.5200033187866211,0.11021041870117188,0.12572073936462402,0.12769746780395508,0.15241789817810059,0.13467073440551758 diff --git a/results/combined/merges_timed/apache/commons-collections.csv b/results/combined/merges_timed/apache/commons-collections.csv index f46c8d95d9..6a889f5de6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,37,108,791,2,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,37,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_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,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_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,7674b9b0c9d0305cbddf610e6eb883903d11b25c5ee6dbcd31964953c2944d13,Tests_failed,6f6376f1caba5156f58885f6680debf681ff08e52f75f5c0ecd7a80c19a68b62,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.027973175048828125,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.09604549407958984,0.7446160316467285,1.2442584037780762,0.049304962158203125,0.07208991050720215,0.04871010780334473,0.07385396957397461,0.07427740097045898 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,37,108,791,2,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,37,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_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,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_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,7674b9b0c9d0305cbddf610e6eb883903d11b25c5ee6dbcd31964953c2944d13,Tests_failed,6f6376f1caba5156f58885f6680debf681ff08e52f75f5c0ecd7a80c19a68b62,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.027973175048828125,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.09604549407958984,0.7446160316467285,1.2442584037780762,0.049304962158203125,0.07208991050720215,0.04871010780334473,0.07385396957397461,0.07427740097045898,0.06807827949523926,0.06922125816345215,0.07284021377563477,0.07305526733398438,0.07042360305786133,0.06981849670410156,0.07178258895874023,0.10896778106689453,0.1042933464050293,0.7700784206390381,1.3298428058624268,0.06825566291809082,0.06906247138977051,0.07007312774658203,0.07189416885375977,0.06977319717407227 diff --git a/results/combined/merges_timed/apache/commons-csv.csv b/results/combined/merges_timed/apache/commons-csv.csv index c7b5f7b190..5fe09a0568 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -108,refs/remotes/origin/pull/54,d950da2f49827211f4b72089eea80a6750d5019a,dd9b3ccf0f21719ed273f820eec8724ef405953e,a35797bea9bd7f7affa7ae94576bd471d822b01b,,True,True,True,26,90,557,2,True,26,Tests_passed,93656b7ff65108f7946c646ff6937e2fb506d30319c923143c515d3c4857fc0b,True,Tests_passed,0cd091656353c0aecf43288f074c7a0349f28159fc988f2458e36b86460891c8,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,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Tests_failed,08bdd2c395fee986c55ebfbcafaee6919a9d310493866995c84e59f70339df93,Tests_passed,21418812d2c3e6ba00d55a6ae3b0cf8c6059bc32524c5fbea112be4a0ea24aab,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,799820bcfc7ed5d911ad2947e33b59e79c2c3a24e2c5b919bd3695bf8c9edb0c,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,0e1410d9ae4944e492f97e2c9a4a982e878f775e4e1fbc048cf60e660458565f,Tests_failed,b12c5d3b7b6d72fe1554834f321ee32f7234c9537a7a7c5bda0f2a0e75edbf34,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,0.13837242126464844,0.13656282424926758,0.017828941345214844,0.21514678001403809,0.13665127754211426,0.13709402084350586,0.13437390327453613,0.1320650577545166,0.1937577724456787,1.0840263366699219,0.9873039722442627,0.2501490116119385,0.2440204620361328,0.24035191535949707,0.24114704132080078,0.24890661239624023 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +108,refs/remotes/origin/pull/54,d950da2f49827211f4b72089eea80a6750d5019a,dd9b3ccf0f21719ed273f820eec8724ef405953e,a35797bea9bd7f7affa7ae94576bd471d822b01b,,True,True,True,26,90,557,2,True,26,Tests_passed,93656b7ff65108f7946c646ff6937e2fb506d30319c923143c515d3c4857fc0b,True,Tests_passed,0cd091656353c0aecf43288f074c7a0349f28159fc988f2458e36b86460891c8,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,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Tests_failed,08bdd2c395fee986c55ebfbcafaee6919a9d310493866995c84e59f70339df93,Tests_passed,21418812d2c3e6ba00d55a6ae3b0cf8c6059bc32524c5fbea112be4a0ea24aab,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,799820bcfc7ed5d911ad2947e33b59e79c2c3a24e2c5b919bd3695bf8c9edb0c,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,0e1410d9ae4944e492f97e2c9a4a982e878f775e4e1fbc048cf60e660458565f,Tests_failed,b12c5d3b7b6d72fe1554834f321ee32f7234c9537a7a7c5bda0f2a0e75edbf34,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,0.13837242126464844,0.13656282424926758,0.017828941345214844,0.21514678001403809,0.13665127754211426,0.13709402084350586,0.13437390327453613,0.1320650577545166,0.1937577724456787,1.0840263366699219,0.9873039722442627,0.2501490116119385,0.2440204620361328,0.24035191535949707,0.24114704132080078,0.24890661239624023,0.18019890785217285,0.23957276344299316,0.2337207794189453,0.24093079566955566,0.23957252502441406,0.23875784873962402,0.238051176071167,0.2693343162536621,0.21299219131469727,1.2714858055114746,1.1358470916748047,0.05313253402709961,0.23870396614074707,0.2361009120941162,0.23719549179077148,0.24184274673461914 diff --git a/results/combined/merges_timed/apache/commons-dbcp.csv b/results/combined/merges_timed/apache/commons-dbcp.csv index bd11496a11..2d0d4cb424 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,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,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,d46396ed526420b8583a61694c7353c391a68c920f68a64cf7d2df4a905ac2ad,Merge_timedout,,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.04799914360046387,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0892486572265625,1.0309994220733643,-1.0,0.08092451095581055,0.09595370292663574,0.08052849769592285,0.10603642463684082,0.10171079635620117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,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,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,d46396ed526420b8583a61694c7353c391a68c920f68a64cf7d2df4a905ac2ad,Merge_timedout,,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,f3ffe7ac508660fd5bcb53f241ed63556c590e2b4470098ce5ac1825ae49eb29,Tests_passed,e19456e09b20ea5a3e79f9ffee2f4525f03e4d71fbcb06ecba34ad4fb32a81b3,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.04799914360046387,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0892486572265625,1.0309994220733643,-1.0,0.08092451095581055,0.09595370292663574,0.08052849769592285,0.10603642463684082,0.10171079635620117,0.09865117073059082,0.10402560234069824,0.10786890983581543,0.10861802101135254,0.1083381175994873,0.10680580139160156,0.10335707664489746,0.15604472160339355,0.13933229446411133,1.0784924030303955,-1.0,0.08807492256164551,0.10598587989807129,0.10131001472473145,0.10144948959350586,0.10428166389465332 diff --git a/results/combined/merges_timed/apache/commons-email.csv b/results/combined/merges_timed/apache/commons-email.csv index b6d548d7be..f9b98707ee 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,False,True,2,7,15,2,True,2,Tests_passed,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,True,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,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,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,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,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,54ae46c97ee8125fe2390960a0766931b9ede9b43ec60075d7f65f4bf9e0ce73,Tests_failed,b140ecd1649b283e3b14f1d27199747c8efc1fd16a9e424fcd21162b10ebe8b6,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,0.035453081130981445,0.03744840621948242,0.03160905838012695,0.02541494369506836,0.040972232818603516,0.03978538513183594,0.046854257583618164,0.14773988723754883,0.11493301391601562,0.9342150688171387,0.3215205669403076,0.046602725982666016,0.07023382186889648,0.04463934898376465,0.07064580917358398,0.07097744941711426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,False,True,2,7,15,2,True,2,Tests_passed,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,True,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,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,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,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,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,54ae46c97ee8125fe2390960a0766931b9ede9b43ec60075d7f65f4bf9e0ce73,Tests_failed,b140ecd1649b283e3b14f1d27199747c8efc1fd16a9e424fcd21162b10ebe8b6,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,0.035453081130981445,0.03744840621948242,0.03160905838012695,0.02541494369506836,0.040972232818603516,0.03978538513183594,0.046854257583618164,0.14773988723754883,0.11493301391601562,0.9342150688171387,0.3215205669403076,0.046602725982666016,0.07023382186889648,0.04463934898376465,0.07064580917358398,0.07097744941711426,0.06657075881958008,0.07108354568481445,0.06946063041687012,0.07374072074890137,0.07317113876342773,0.07144451141357422,0.07223701477050781,0.10820412635803223,0.10252618789672852,0.9867668151855469,0.3527107238769531,0.06538677215576172,0.07118511199951172,0.06997823715209961,0.06864309310913086,0.0697019100189209 diff --git a/results/combined/merges_timed/apache/commons-fileupload.csv b/results/combined/merges_timed/apache/commons-fileupload.csv index 3778d94b6d..36602a0682 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,,True,15,51,,2,True,15,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,True,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,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,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,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,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,b2e588089fd3a8295a586bcd8c9ab2f67c5c6242aa3a929360984cf6d33b03da,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,0.042112112045288086,0.05453085899353027,0.048302412033081055,0.02271103858947754,0.04271388053894043,0.06250882148742676,0.055606842041015625,0.16533446311950684,0.1304466724395752,0.8443593978881836,0.4975154399871826,0.04673433303833008,0.07051610946655273,0.045668840408325195,0.07085800170898438,0.07040572166442871 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,,True,15,51,,2,True,15,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,True,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,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,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,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,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,b2e588089fd3a8295a586bcd8c9ab2f67c5c6242aa3a929360984cf6d33b03da,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,0.042112112045288086,0.05453085899353027,0.048302412033081055,0.02271103858947754,0.04271388053894043,0.06250882148742676,0.055606842041015625,0.16533446311950684,0.1304466724395752,0.8443593978881836,0.4975154399871826,0.04673433303833008,0.07051610946655273,0.045668840408325195,0.07085800170898438,0.07040572166442871,0.06511759757995605,0.06899166107177734,0.06846117973327637,0.0710909366607666,0.06951475143432617,0.06498122215270996,0.06817460060119629,0.10611248016357422,0.09981060028076172,0.8326888084411621,0.5381309986114502,0.06884217262268066,0.06779360771179199,0.06752610206604004,0.06699061393737793,0.06722640991210938 diff --git a/results/combined/merges_timed/apache/commons-imaging.csv b/results/combined/merges_timed/apache/commons-imaging.csv index 45c076a361..97e6100ba7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,True,480.0,1205,6176.0,3,True,480,Tests_passed,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,True,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,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,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,6a24a74339ce8c7b2aa52d61d85fbf08ae84541e0b463493545f96e87c54d7d9,Tests_failed,75871620044f27e09c2f12614813d87c169c862b0126e8a2a4f5d8643fdb46c4,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,0.2947847843170166,0.3325920104980469,0.48436713218688965,0.5084996223449707,0.4823265075683594,0.47649359703063965,0.4805295467376709,0.7423384189605713,0.4356272220611572,2.357090473175049,4.9480345249176025,0.29996442794799805,0.5995299816131592,0.3045327663421631,0.5839903354644775,0.8267807960510254 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,True,480.0,1205,6176.0,3,True,480,Tests_passed,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,True,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,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,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,6a24a74339ce8c7b2aa52d61d85fbf08ae84541e0b463493545f96e87c54d7d9,Tests_failed,75871620044f27e09c2f12614813d87c169c862b0126e8a2a4f5d8643fdb46c4,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,Tests_passed,a2915d321bb77ef870598cd51cff928cc4192844bf4afe0088fcf47e942cc819,0.2947847843170166,0.3325920104980469,0.48436713218688965,0.5084996223449707,0.4823265075683594,0.47649359703063965,0.4805295467376709,0.7423384189605713,0.4356272220611572,2.357090473175049,4.9480345249176025,0.29996442794799805,0.5995299816131592,0.3045327663421631,0.5839903354644775,0.8267807960510254,0.35547447204589844,0.6649987697601318,0.9048192501068115,0.436204195022583,0.8166208267211914,0.5902974605560303,0.966195821762085,0.5653760433197021,1.0161678791046143,2.634648323059082,4.608850717544556,0.4774956703186035,0.4315478801727295,0.5174987316131592,0.48612332344055176,0.523561954498291 diff --git a/results/combined/merges_timed/apache/commons-io.csv b/results/combined/merges_timed/apache/commons-io.csv index b7cb414ccc..a4792b61de 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,True,7,36,215.0,2,True,7,Tests_passed,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,True,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,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_failed,5d9ba6a72dac22704217e8cd2274784425433bc38cfb64db62b2d9f301779f19,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,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_failed,5d9ba6a72dac22704217e8cd2274784425433bc38cfb64db62b2d9f301779f19,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.027209043502807617,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.09441828727722168,0.045067787170410156,1.1162848472595215,0.05240225791931152,0.08883380889892578,0.051744699478149414,0.09083390235900879,0.09463882446289062 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,True,7,36,215.0,2,True,7,Tests_passed,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,True,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,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_failed,5d9ba6a72dac22704217e8cd2274784425433bc38cfb64db62b2d9f301779f19,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,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_failed,5d9ba6a72dac22704217e8cd2274784425433bc38cfb64db62b2d9f301779f19,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.027209043502807617,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.09441828727722168,0.045067787170410156,1.1162848472595215,0.05240225791931152,0.08883380889892578,0.051744699478149414,0.09083390235900879,0.09463882446289062,0.08779335021972656,0.0865788459777832,0.09030032157897949,0.09025073051452637,0.09023427963256836,0.09026169776916504,0.0907900333404541,0.13443803787231445,0.12431192398071289,0.10081982612609863,1.1568264961242676,0.08602070808410645,0.08626246452331543,0.09095144271850586,0.08578777313232422,0.08532571792602539 diff --git a/results/combined/merges_timed/apache/commons-jexl.csv b/results/combined/merges_timed/apache/commons-jexl.csv index d8b89238f3..5a802959f8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -168,refs/heads/master,153f1545226f1bcd238202853cc9584f11970e67,b54b3c9a912a3d96e584655f1ffd9564f28942ca,36a7f8da6676f4bdd8a1597189610aa4e55cb4d9,,True,False,True,21,38,74,2,True,21,Tests_passed,360017be1eb12be61ac6a2717dacad2d172e4bf0b84759eab830b82cf96c76cf,True,Tests_passed,8212f8fffad184fc8cff696d8e58a304bc8cb71dc9d8af134b8375743113b415,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,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,c0b93b90273bc7a400583863754f6ee95fcc276783f232b125704bb77b581bf7,Tests_failed,7704684aa8a1636604f549b4e2c291840fe0748c4a28f443cd90ec1d67bbf814,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,0.03750467300415039,0.05520319938659668,0.029537677764892578,0.039260149002075195,0.041976213455200195,0.028053998947143555,0.041548967361450195,0.17161798477172852,0.11366891860961914,0.9441494941711426,1.0397508144378662,0.07063126564025879,0.09603643417358398,0.07349038124084473,0.08669257164001465,0.10087847709655762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +168,refs/heads/master,153f1545226f1bcd238202853cc9584f11970e67,b54b3c9a912a3d96e584655f1ffd9564f28942ca,36a7f8da6676f4bdd8a1597189610aa4e55cb4d9,,True,False,True,21,38,74,2,True,21,Tests_passed,360017be1eb12be61ac6a2717dacad2d172e4bf0b84759eab830b82cf96c76cf,True,Tests_passed,8212f8fffad184fc8cff696d8e58a304bc8cb71dc9d8af134b8375743113b415,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,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,c0b93b90273bc7a400583863754f6ee95fcc276783f232b125704bb77b581bf7,Tests_failed,7704684aa8a1636604f549b4e2c291840fe0748c4a28f443cd90ec1d67bbf814,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,Tests_passed,a8b4a4f248dd63c87bf060c2b19fb557243cbd35bed9bc41ec1dfca458556a26,0.03750467300415039,0.05520319938659668,0.029537677764892578,0.039260149002075195,0.041976213455200195,0.028053998947143555,0.041548967361450195,0.17161798477172852,0.11366891860961914,0.9441494941711426,1.0397508144378662,0.07063126564025879,0.09603643417358398,0.07349038124084473,0.08669257164001465,0.10087847709655762,0.10268497467041016,0.07352209091186523,0.10144805908203125,0.07548689842224121,0.10886907577514648,0.10784554481506348,0.10702252388000488,0.13717365264892578,0.12922191619873047,1.085071086883545,1.1763417720794678,0.08437728881835938,0.07179474830627441,0.09889602661132812,0.07350945472717285,0.1010887622833252 diff --git a/results/combined/merges_timed/apache/commons-lang.csv b/results/combined/merges_timed/apache/commons-lang.csv index eb8194368b..4f475f5ada 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,Tests_passed,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,True,47.0,151,527.0,3,True,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,True,47,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,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Tests_failed,4c6741b755721b9cae35f5262c42d989eae37d86941d53f482aabb4dd3077ccc,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,ea259ea59953e9863a17c145adcfccbd8d75fa70c6140056552b5448dba6374f,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_failed,886a886dc4cd552db7e1602ead5548008bd23a82f9496074377a70f827931cce,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.05800890922546387,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.16912579536437988,0.05789828300476074,4.680435419082642,0.08265900611877441,0.10457444190979004,0.09343862533569336,0.11682820320129395,0.14887523651123047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,Tests_passed,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,True,47.0,151,527.0,3,True,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,True,47,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,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Tests_failed,4c6741b755721b9cae35f5262c42d989eae37d86941d53f482aabb4dd3077ccc,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,ea259ea59953e9863a17c145adcfccbd8d75fa70c6140056552b5448dba6374f,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_failed,886a886dc4cd552db7e1602ead5548008bd23a82f9496074377a70f827931cce,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.05800890922546387,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.16912579536437988,0.05789828300476074,4.680435419082642,0.08265900611877441,0.10457444190979004,0.09343862533569336,0.11682820320129395,0.14887523651123047,0.11435174942016602,0.13599729537963867,0.11811375617980957,0.1511549949645996,0.11062169075012207,0.11196780204772949,0.11732983589172363,0.17520833015441895,0.17509102821350098,0.13710713386535645,5.013683795928955,0.11278605461120605,0.11111688613891602,0.1112515926361084,0.11353826522827148,0.13329434394836426 diff --git a/results/combined/merges_timed/apache/commons-math.csv b/results/combined/merges_timed/apache/commons-math.csv index c220e4d7b4..1d5c97a8ef 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,True,300,1163,123270,2,True,300,Tests_passed,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,True,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,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,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,9928b5dd988293619e38a6722140a0ebb795728103148eede59086cbd6f773f2,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,0.05518198013305664,0.05426836013793945,0.0834505558013916,0.09134721755981445,0.08269381523132324,0.0839986801147461,0.08271622657775879,0.12947344779968262,0.10870695114135742,1.0606262683868408,9.587121486663818,0.142258882522583,0.17247653007507324,0.13997244834899902,0.17344927787780762,0.17317414283752441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,True,300,1163,123270,2,True,300,Tests_passed,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,True,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,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,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,9928b5dd988293619e38a6722140a0ebb795728103148eede59086cbd6f773f2,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,838984eea87307834de2ef14805cd176b2ef43beddd8507757cd14cdc2b4da1e,Tests_passed,1dcd1a3333ed480528e53963369fb0091c5c10b7d44da126a12b63fdd732b74f,0.05518198013305664,0.05426836013793945,0.0834505558013916,0.09134721755981445,0.08269381523132324,0.0839986801147461,0.08271622657775879,0.12947344779968262,0.10870695114135742,1.0606262683868408,9.587121486663818,0.142258882522583,0.17247653007507324,0.13997244834899902,0.17344927787780762,0.17317414283752441,0.16279196739196777,0.16445136070251465,0.19446587562561035,0.19613122940063477,0.1902294158935547,0.19388127326965332,0.197800874710083,0.24632573127746582,0.2169175148010254,1.0961194038391113,9.76712441444397,0.16409063339233398,0.16211223602294922,0.16029047966003418,0.16460371017456055,0.14968371391296387 diff --git a/results/combined/merges_timed/apache/commons-net.csv b/results/combined/merges_timed/apache/commons-net.csv index f5f4672bcf..0f98fdc6d2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,True,True,True,76,372,1159.0,3,True,76,Tests_passed,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,True,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,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,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,b2fcc774887f261952c88456c45a7c2652f5b18a5ceb07749ff5ab7310ab68ca,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,f960261c006f590b530ba684bb5577c6c71270b696dac237614f4d7c8b0afd56,Tests_failed,0a428c1b26fb26d0e7d0c30e7a32c26485535a907a7edc4d8e9d3b2b413fd96c,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,0.056407928466796875,0.05790519714355469,0.04941606521606445,0.03352212905883789,0.039900779724121094,0.06534934043884277,0.07602667808532715,0.19331598281860352,0.17734718322753906,1.9663341045379639,1.436371088027954,0.08157753944396973,0.10686945915222168,0.09043431282043457,0.11412596702575684,0.11879611015319824 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,True,True,True,76,372,1159.0,3,True,76,Tests_passed,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,True,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,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,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,b2fcc774887f261952c88456c45a7c2652f5b18a5ceb07749ff5ab7310ab68ca,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,f960261c006f590b530ba684bb5577c6c71270b696dac237614f4d7c8b0afd56,Tests_failed,0a428c1b26fb26d0e7d0c30e7a32c26485535a907a7edc4d8e9d3b2b413fd96c,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,0.056407928466796875,0.05790519714355469,0.04941606521606445,0.03352212905883789,0.039900779724121094,0.06534934043884277,0.07602667808532715,0.19331598281860352,0.17734718322753906,1.9663341045379639,1.436371088027954,0.08157753944396973,0.10686945915222168,0.09043431282043457,0.11412596702575684,0.11879611015319824,0.10900259017944336,0.10967397689819336,0.11913442611694336,0.11647677421569824,0.14498329162597656,0.1473679542541504,0.14345884323120117,0.1942300796508789,0.18673324584960938,2.059896945953369,1.582599401473999,0.0910484790802002,0.09345650672912598,0.09257960319519043,0.0993492603302002,0.11299014091491699 diff --git a/results/combined/merges_timed/apache/commons-ognl.csv b/results/combined/merges_timed/apache/commons-ognl.csv index 353050fea8..a3ae9b9250 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,True,False,True,11,31,176,2,True,11,Tests_passed,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,True,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,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_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,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_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,2e52a60d4e6559a107727ceb753b40e202562737927c9f83898b1cbdda8efec2,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,0.05082416534423828,0.047019004821777344,0.041263580322265625,0.03682994842529297,0.03685617446899414,0.05785393714904785,0.04591941833496094,0.17160606384277344,0.12070584297180176,0.8282818794250488,0.7130677700042725,0.03769636154174805,0.06281185150146484,0.037798166275024414,0.0852348804473877,0.08705520629882812 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,True,False,True,11,31,176,2,True,11,Tests_passed,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,True,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,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_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,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_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,2e52a60d4e6559a107727ceb753b40e202562737927c9f83898b1cbdda8efec2,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,0.05082416534423828,0.047019004821777344,0.041263580322265625,0.03682994842529297,0.03685617446899414,0.05785393714904785,0.04591941833496094,0.17160606384277344,0.12070584297180176,0.8282818794250488,0.7130677700042725,0.03769636154174805,0.06281185150146484,0.037798166275024414,0.0852348804473877,0.08705520629882812,0.08619141578674316,0.05915379524230957,0.06155657768249512,0.0895233154296875,0.08900642395019531,0.09009528160095215,0.06206917762756348,0.09312582015991211,0.09172296524047852,0.8451919555664062,0.6976444721221924,0.07512712478637695,0.08298349380493164,0.08316993713378906,0.059777259826660156,0.05921435356140137 diff --git a/results/combined/merges_timed/apache/commons-pool.csv b/results/combined/merges_timed/apache/commons-pool.csv index 36a8659acb..3455b80a99 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,True,80,1028,22102,6,True,84,Tests_passed,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,True,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,True,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,aa6e66911bea5debe129b95e7d0934e1c6c748ce7a9616459191301f9bac1af3,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e17495a8deb5d4c9621e243cc79813a5655553c6850b8173f3f99ebbe78dc3df,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,0315e15d3fc51fd816b2e8b32ca552f40bcf62cc42c24a1e6e5e8b2dcc66962a,Merge_failed,3ac4e781bb178cddd1797715f38a65976580b422edab991c91d0b774f2204f94,Merge_failed,1cf4ab2b859a4aa2ca8738f5480f678db0f8a170a3b8309eda0904a3963a1eb7,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,0.06531000137329102,0.06485414505004883,0.07683515548706055,0.04301047325134277,0.07098650932312012,0.07061195373535156,0.062270164489746094,0.5534019470214844,0.49430203437805176,8.04391884803772,48.52143096923828,0.10753822326660156,0.10674834251403809,0.10830426216125488,0.12788701057434082,0.12226200103759766 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,True,80,1028,22102,6,True,84,Tests_passed,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,True,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,True,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,aa6e66911bea5debe129b95e7d0934e1c6c748ce7a9616459191301f9bac1af3,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e17495a8deb5d4c9621e243cc79813a5655553c6850b8173f3f99ebbe78dc3df,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,0315e15d3fc51fd816b2e8b32ca552f40bcf62cc42c24a1e6e5e8b2dcc66962a,Merge_failed,3ac4e781bb178cddd1797715f38a65976580b422edab991c91d0b774f2204f94,Merge_failed,1cf4ab2b859a4aa2ca8738f5480f678db0f8a170a3b8309eda0904a3963a1eb7,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,e5d77cf62a3c0f704dab073fc628c8205f8cd7d26e80444019deb33e165683e4,Merge_failed,9fd6a3247a516af60ed454f1f8265a29bb7fef845ee0451595ab5a811f630958,0.06531000137329102,0.06485414505004883,0.07683515548706055,0.04301047325134277,0.07098650932312012,0.07061195373535156,0.062270164489746094,0.5534019470214844,0.49430203437805176,8.04391884803772,48.52143096923828,0.10753822326660156,0.10674834251403809,0.10830426216125488,0.12788701057434082,0.12226200103759766,0.11730408668518066,0.11641454696655273,0.12373995780944824,0.1251213550567627,0.12515497207641602,0.12780332565307617,0.126617431640625,0.2340712547302246,0.31392407417297363,7.401375770568848,49.17770981788635,0.11632871627807617,0.1197054386138916,0.1192023754119873,0.11558365821838379,0.12046408653259277 diff --git a/results/combined/merges_timed/apache/commons-validator.csv b/results/combined/merges_timed/apache/commons-validator.csv index a4d14f2a19..0c69532c35 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,True,74,363,1667,2,True,74,Tests_passed,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,True,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,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_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,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_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,7a631429b74200abcc8213e7d721a69221c3e94774067224add2dae832f7354a,Tests_failed,fbeb973226ddbbcbc8c00e471dbde384fb9be747917308c45839cba7e097b193,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,0.05489754676818848,0.03796744346618652,0.04816913604736328,0.04077577590942383,0.0699460506439209,0.051720380783081055,0.0608978271484375,0.2087235450744629,0.12534284591674805,1.0217041969299316,1.4332237243652344,0.06680417060852051,0.09207534790039062,0.05159258842468262,0.07701230049133301,0.08907485008239746 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,True,74,363,1667,2,True,74,Tests_passed,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,True,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,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_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,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_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,7a631429b74200abcc8213e7d721a69221c3e94774067224add2dae832f7354a,Tests_failed,fbeb973226ddbbcbc8c00e471dbde384fb9be747917308c45839cba7e097b193,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,0.05489754676818848,0.03796744346618652,0.04816913604736328,0.04077577590942383,0.0699460506439209,0.051720380783081055,0.0608978271484375,0.2087235450744629,0.12534284591674805,1.0217041969299316,1.4332237243652344,0.06680417060852051,0.09207534790039062,0.05159258842468262,0.07701230049133301,0.08907485008239746,0.07516098022460938,0.09410476684570312,0.09699392318725586,0.0930178165435791,0.09376382827758789,0.08898282051086426,0.08014178276062012,0.1150197982788086,0.11976313591003418,1.0881338119506836,1.4895415306091309,0.0768442153930664,0.08908748626708984,0.09109330177307129,0.08759522438049316,0.08834290504455566 diff --git a/results/combined/merges_timed/apache/directory-kerby.csv b/results/combined/merges_timed/apache/directory-kerby.csv index e28afa3e9e..df1dc60d40 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,False,True,4,3,8.0,2,True,4,Tests_passed,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,True,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,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,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,da0bf41c4e0b967b37f3b8a76488243e1dc21803c8caff610e0ae57064021c25,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Tests_failed,bd2c4510683d3b6e3c5aef8d7ddb5e76b4cf5e66cf1cfd2681b3a5f2b9cffe12,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,0.04034304618835449,0.04445600509643555,0.04687094688415527,0.01729869842529297,0.05078601837158203,0.04318356513977051,0.05274796485900879,0.18733787536621094,0.08249640464782715,0.9878690242767334,0.32527971267700195,0.042906761169433594,0.044896841049194336,0.04394364356994629,0.04371190071105957,0.044716835021972656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,False,True,4,3,8.0,2,True,4,Tests_passed,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,True,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,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,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,da0bf41c4e0b967b37f3b8a76488243e1dc21803c8caff610e0ae57064021c25,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Tests_failed,bd2c4510683d3b6e3c5aef8d7ddb5e76b4cf5e66cf1cfd2681b3a5f2b9cffe12,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,0.04034304618835449,0.04445600509643555,0.04687094688415527,0.01729869842529297,0.05078601837158203,0.04318356513977051,0.05274796485900879,0.18733787536621094,0.08249640464782715,0.9878690242767334,0.32527971267700195,0.042906761169433594,0.044896841049194336,0.04394364356994629,0.04371190071105957,0.044716835021972656,0.04424166679382324,0.04532361030578613,0.04493355751037598,0.04580569267272949,0.044698238372802734,0.044175148010253906,0.04465222358703613,0.07964301109313965,0.07916998863220215,1.0384666919708252,0.38837766647338867,0.04359745979309082,0.04479217529296875,0.04526686668395996,0.04465055465698242,0.04540276527404785 diff --git a/results/combined/merges_timed/apache/fop.csv b/results/combined/merges_timed/apache/fop.csv index 721a87967c..185ca4d35e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,True,True,True,281,1150,4999.0,12,True,281,Tests_passed,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,True,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,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,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,3ec6402f5be9c8c6767d98158867b0b64cd3b6bd1ba085d07cb72aeb3e950179,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Tests_passed,2791bec85938992bf8ffb97eaf10e9fde3fde6cbac36c616626820796fadad95,Tests_failed,0a887c5e75adb178289b4f7914762382f1d93e74d42d8bdd4b97720b5eac47eb,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,0.10559368133544922,0.10694169998168945,0.13389873504638672,0.15649986267089844,0.1354825496673584,0.13524770736694336,0.1648256778717041,0.5192890167236328,0.6908278465270996,10.537936210632324,11.23635482788086,0.17521095275878906,0.558725118637085,0.18782830238342285,0.6137158870697021,0.5671577453613281 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,True,True,True,281,1150,4999.0,12,True,281,Tests_passed,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,True,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,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,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,3ec6402f5be9c8c6767d98158867b0b64cd3b6bd1ba085d07cb72aeb3e950179,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Tests_passed,2791bec85938992bf8ffb97eaf10e9fde3fde6cbac36c616626820796fadad95,Tests_failed,0a887c5e75adb178289b4f7914762382f1d93e74d42d8bdd4b97720b5eac47eb,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,0.10559368133544922,0.10694169998168945,0.13389873504638672,0.15649986267089844,0.1354825496673584,0.13524770736694336,0.1648256778717041,0.5192890167236328,0.6908278465270996,10.537936210632324,11.23635482788086,0.17521095275878906,0.558725118637085,0.18782830238342285,0.6137158870697021,0.5671577453613281,0.5429637432098389,0.5599193572998047,0.47052502632141113,0.5789732933044434,0.5495033264160156,0.584200382232666,0.612027645111084,0.8329503536224365,0.813427209854126,11.443851947784424,13.356008529663086,0.46905970573425293,0.5677938461303711,0.545414924621582,0.565232515335083,0.5145978927612305 diff --git a/results/combined/merges_timed/apache/geronimo-specs.csv b/results/combined/merges_timed/apache/geronimo-specs.csv index b5b5764178..f5906da1ee 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,True,7,10,143.0,2,True,7,Tests_passed,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,True,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,True,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8999d89554b0214e00c8bb31db923de3c0a4f637dcb60e0e315caeb6c6bc618f,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,02737a379b0130d6a38d534fc7c3130a6b80f61252f3a9289e55f6f1f2a71586,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Tests_passed,7b2004e2cfc84b5384376df8ecbba464dd5b4c41f93eb9cf8d3ba26004b1199f,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,0.0780034065246582,0.07769227027893066,0.07170677185058594,0.030542373657226562,0.07898068428039551,0.09959554672241211,0.04746842384338379,0.2645907402038574,0.1489276885986328,0.4882168769836426,0.5305962562561035,0.06001758575439453,0.058997154235839844,0.059426307678222656,0.05859565734863281,0.05822324752807617 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,True,7,10,143.0,2,True,7,Tests_passed,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,True,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,True,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8999d89554b0214e00c8bb31db923de3c0a4f637dcb60e0e315caeb6c6bc618f,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,02737a379b0130d6a38d534fc7c3130a6b80f61252f3a9289e55f6f1f2a71586,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Tests_passed,7b2004e2cfc84b5384376df8ecbba464dd5b4c41f93eb9cf8d3ba26004b1199f,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,0.0780034065246582,0.07769227027893066,0.07170677185058594,0.030542373657226562,0.07898068428039551,0.09959554672241211,0.04746842384338379,0.2645907402038574,0.1489276885986328,0.4882168769836426,0.5305962562561035,0.06001758575439453,0.058997154235839844,0.059426307678222656,0.05859565734863281,0.05822324752807617,0.05669975280761719,0.05672311782836914,0.0570828914642334,0.05770301818847656,0.05845212936401367,0.058470726013183594,0.05718517303466797,0.10158133506774902,0.09509968757629395,0.5159547328948975,0.5969491004943848,0.05389809608459473,0.05645561218261719,0.05534195899963379,0.055576324462890625,0.055751800537109375 diff --git a/results/combined/merges_timed/apache/incubator-tamaya.csv b/results/combined/merges_timed/apache/incubator-tamaya.csv index a9f58974f7..ab68e5a4d3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,True,84,182,633,14,True,84,Tests_passed,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,True,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,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,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,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,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,786ccf27484a22ac0ca61abfa0210ace10d35cf67bf69b0d97121f3469995c8e,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,0.04412198066711426,0.02231454849243164,0.06458353996276855,0.0347287654876709,0.056798458099365234,0.06700420379638672,0.06505393981933594,0.9765169620513916,0.7697136402130127,6.760615110397339,0.8118319511413574,0.049452781677246094,0.30174899101257324,0.04569530487060547,0.29872989654541016,0.30155110359191895 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,True,84,182,633,14,True,84,Tests_passed,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,True,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,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,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,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,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,786ccf27484a22ac0ca61abfa0210ace10d35cf67bf69b0d97121f3469995c8e,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,0.04412198066711426,0.02231454849243164,0.06458353996276855,0.0347287654876709,0.056798458099365234,0.06700420379638672,0.06505393981933594,0.9765169620513916,0.7697136402130127,6.760615110397339,0.8118319511413574,0.049452781677246094,0.30174899101257324,0.04569530487060547,0.29872989654541016,0.30155110359191895,0.2928645610809326,0.30744266510009766,0.2979304790496826,0.30272459983825684,0.32168030738830566,0.2989213466644287,0.2997469902038574,0.5504608154296875,0.6218595504760742,7.674884080886841,0.9367682933807373,0.2953619956970215,0.29747533798217773,0.3217911720275879,0.29225659370422363,0.297609806060791 diff --git a/results/combined/merges_timed/apache/jackrabbit-filevault.csv b/results/combined/merges_timed/apache/jackrabbit-filevault.csv index 388efa57a5..fecbcc1c5a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,True,4,15,56,2,True,4,Tests_passed,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,True,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,True,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,4969e185faf3b86cd00d72721731493bc321c6c2e379924f224e6b1d1d0c8f38,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Tests_failed,0f9d5a1b31707f769d8f58ef3ebda7a47a7e17204fcaf9b60b17f932fcc017c6,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_failed,38c75810bc6fbcceb24061b7c3119bb92061b319b9894cbd38954d5af76f61b8,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,0.0649416446685791,0.061627864837646484,0.06561279296875,0.021250486373901367,0.06662702560424805,0.06759762763977051,0.06993365287780762,0.2211289405822754,0.14115285873413086,0.041666269302368164,0.3500335216522217,0.05071258544921875,0.07225489616394043,0.05104851722717285,0.0728769302368164,0.07338380813598633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,True,4,15,56,2,True,4,Tests_passed,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,True,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,True,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,4969e185faf3b86cd00d72721731493bc321c6c2e379924f224e6b1d1d0c8f38,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Tests_failed,0f9d5a1b31707f769d8f58ef3ebda7a47a7e17204fcaf9b60b17f932fcc017c6,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_failed,38c75810bc6fbcceb24061b7c3119bb92061b319b9894cbd38954d5af76f61b8,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,Tests_passed,d0c47a681828ba6f432c28b64ea1c603d242f64134e85b0de4e4bc3b5f01eb7b,0.0649416446685791,0.061627864837646484,0.06561279296875,0.021250486373901367,0.06662702560424805,0.06759762763977051,0.06993365287780762,0.2211289405822754,0.14115285873413086,0.041666269302368164,0.3500335216522217,0.05071258544921875,0.07225489616394043,0.05104851722717285,0.0728769302368164,0.07338380813598633,0.0729517936706543,0.07293200492858887,0.07302618026733398,0.07154488563537598,0.07473397254943848,0.07385683059692383,0.0741891860961914,0.1115567684173584,0.11095666885375977,0.09160590171813965,0.4503180980682373,0.07314944267272949,0.07131719589233398,0.07206392288208008,0.07199883460998535,0.07413601875305176 diff --git a/results/combined/merges_timed/apache/jackrabbit.csv b/results/combined/merges_timed/apache/jackrabbit.csv index cb72e214ea..8b346bcccf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,True,30,57,190.0,2,True,30,Tests_passed,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,True,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,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,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,a560bdb40578efeea0d97b94acfa58ecdbd13d2b0fd31464d958d9448c64713a,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,0.02766704559326172,0.027326583862304688,0.032826900482177734,0.044775962829589844,0.032861948013305664,0.032878875732421875,0.03300070762634277,0.07567787170410156,0.08365535736083984,3.3357787132263184,1.0990891456604004,0.07911062240600586,0.1284017562866211,0.07584595680236816,0.1292262077331543,0.1279594898223877 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,True,30,57,190.0,2,True,30,Tests_passed,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,True,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,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,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,a560bdb40578efeea0d97b94acfa58ecdbd13d2b0fd31464d958d9448c64713a,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,Tests_passed,90a6a7d3087ff383b80687dd16b0ad4a3e462cdec08ca6209d78d85bdb2ab48b,0.02766704559326172,0.027326583862304688,0.032826900482177734,0.044775962829589844,0.032861948013305664,0.032878875732421875,0.03300070762634277,0.07567787170410156,0.08365535736083984,3.3357787132263184,1.0990891456604004,0.07911062240600586,0.1284017562866211,0.07584595680236816,0.1292262077331543,0.1279594898223877,0.1188516616821289,0.12630581855773926,0.1228480339050293,0.12396812438964844,0.12134099006652832,0.12101054191589355,0.12616562843322754,0.17917990684509277,0.15680432319641113,3.5468695163726807,1.1655569076538086,0.11648726463317871,0.1214599609375,0.12038087844848633,0.12170124053955078,0.12289619445800781 diff --git a/results/combined/merges_timed/apache/james-mime4j.csv b/results/combined/merges_timed/apache/james-mime4j.csv index f1f029d021..267c70ff4a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,True,True,True,7,15,46,2,True,7,Tests_passed,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,True,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,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,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,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,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,6c1db163dacaf107da1d48fc081f0f965a500213c3b10e79daa7133e2edc754a,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,0.014119148254394531,0.013367176055908203,0.013558149337768555,0.019097089767456055,0.013826608657836914,0.014172792434692383,0.014788389205932617,0.044965267181396484,0.07074785232543945,0.8709399700164795,0.44626402854919434,0.03928947448730469,0.06130671501159668,0.040042877197265625,0.0628364086151123,0.06309628486633301 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,True,True,True,7,15,46,2,True,7,Tests_passed,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,True,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,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,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,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,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,6c1db163dacaf107da1d48fc081f0f965a500213c3b10e79daa7133e2edc754a,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,0.014119148254394531,0.013367176055908203,0.013558149337768555,0.019097089767456055,0.013826608657836914,0.014172792434692383,0.014788389205932617,0.044965267181396484,0.07074785232543945,0.8709399700164795,0.44626402854919434,0.03928947448730469,0.06130671501159668,0.040042877197265625,0.0628364086151123,0.06309628486633301,0.06221795082092285,0.06245064735412598,0.061875343322753906,0.06165575981140137,0.0621190071105957,0.06341671943664551,0.06350302696228027,0.09679961204528809,0.09343361854553223,0.8495213985443115,0.4639315605163574,0.06173825263977051,0.06199288368225098,0.05989432334899902,0.060604095458984375,0.060402870178222656 diff --git a/results/combined/merges_timed/apache/maven-enforcer.csv b/results/combined/merges_timed/apache/maven-enforcer.csv index 30b8801ba1..c97665707d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,True,18,59,280,2,True,18,Tests_passed,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,True,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,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_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,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_failed,03c5f3ae801ea6d9d2e7487f6e80d6c2890593ba3c27237613b91702188c19e5,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,0.04601097106933594,0.039258718490600586,0.057570695877075195,0.02008533477783203,0.04933357238769531,0.05317401885986328,0.05611753463745117,0.18208980560302734,0.11168527603149414,0.9930119514465332,-1.0,0.037439823150634766,0.06605720520019531,0.03757739067077637,0.06534433364868164,0.06921815872192383 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,True,18,59,280,2,True,18,Tests_passed,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,True,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,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_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,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_failed,03c5f3ae801ea6d9d2e7487f6e80d6c2890593ba3c27237613b91702188c19e5,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,0.04601097106933594,0.039258718490600586,0.057570695877075195,0.02008533477783203,0.04933357238769531,0.05317401885986328,0.05611753463745117,0.18208980560302734,0.11168527603149414,0.9930119514465332,-1.0,0.037439823150634766,0.06605720520019531,0.03757739067077637,0.06534433364868164,0.06921815872192383,0.06404566764831543,0.0642237663269043,0.06302309036254883,0.08214712142944336,0.06452441215515137,0.06189084053039551,0.06109309196472168,0.09661531448364258,0.09487676620483398,1.0517582893371582,-1.0,0.062376976013183594,0.06037020683288574,0.0618283748626709,0.06014609336853027,0.061705589294433594 diff --git a/results/combined/merges_timed/apache/maven-plugin-tools.csv b/results/combined/merges_timed/apache/maven-plugin-tools.csv index 414e5e3edf..b2fedfa950 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,True,,True,165,622,,7,True,166,Tests_passed,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,True,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,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,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_timedout,,Merge_failed,58ed3efa262031d60ed6369c72746a65b0306741fd04eae49b6b51c3859caf10,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,57dc373248b2943dbd97d01f46e9a1bd23a7a2373ca40945ff667eb72dece22e,Merge_failed,ba263c4b36eed12698ba3a56f92866819b4eeb880a70ba2f31934872289558ff,Merge_failed,384c910548f0ec0495978cfc9ca7a726f18098bcb8feb90cb1fe038506429414,Merge_timedout,,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,0.027008056640625,0.03358650207519531,0.02932453155517578,0.039362192153930664,0.03667092323303223,0.036715030670166016,0.03673863410949707,0.1335277557373047,0.3613150119781494,5.063374757766724,-1.0,0.11466765403747559,0.16465258598327637,0.11112308502197266,0.16563916206359863,0.16911768913269043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,True,,True,165,622,,7,True,166,Tests_passed,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,True,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,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,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_timedout,,Merge_failed,58ed3efa262031d60ed6369c72746a65b0306741fd04eae49b6b51c3859caf10,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,57dc373248b2943dbd97d01f46e9a1bd23a7a2373ca40945ff667eb72dece22e,Merge_failed,ba263c4b36eed12698ba3a56f92866819b4eeb880a70ba2f31934872289558ff,Merge_failed,384c910548f0ec0495978cfc9ca7a726f18098bcb8feb90cb1fe038506429414,Merge_timedout,,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,Merge_failed,e2c54a999e2a288c139c8bd08c9f50d5b78473439811adc35e888e777be1d358,0.027008056640625,0.03358650207519531,0.02932453155517578,0.039362192153930664,0.03667092323303223,0.036715030670166016,0.03673863410949707,0.1335277557373047,0.3613150119781494,5.063374757766724,-1.0,0.11466765403747559,0.16465258598327637,0.11112308502197266,0.16563916206359863,0.16911768913269043,0.15312933921813965,0.15207815170288086,0.15568947792053223,0.15558958053588867,0.15590310096740723,0.15483403205871582,0.15401792526245117,0.2714824676513672,0.33342671394348145,5.467098951339722,-1.0,0.1588764190673828,0.15082573890686035,0.1509699821472168,0.15479135513305664,0.15398526191711426 diff --git a/results/combined/merges_timed/apache/metamodel.csv b/results/combined/merges_timed/apache/metamodel.csv index 5c24e3153a..1afb3aea0e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,True,5,62,152.0,2,True,5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,True,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,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_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,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,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,0.06082725524902344,0.06186628341674805,0.06110119819641113,0.022295236587524414,0.061901092529296875,0.06868672370910645,0.05989837646484375,0.20444822311401367,0.12329316139221191,0.05340123176574707,0.60845947265625,0.04886603355407715,0.07469320297241211,0.047426700592041016,0.07469558715820312,0.07276773452758789 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,True,5,62,152.0,2,True,5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,True,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,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_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,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,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,0.06082725524902344,0.06186628341674805,0.06110119819641113,0.022295236587524414,0.061901092529296875,0.06868672370910645,0.05989837646484375,0.20444822311401367,0.12329316139221191,0.05340123176574707,0.60845947265625,0.04886603355407715,0.07469320297241211,0.047426700592041016,0.07469558715820312,0.07276773452758789,0.07033085823059082,0.07237100601196289,0.07453656196594238,0.07631063461303711,0.07591629028320312,0.0747215747833252,0.07449173927307129,0.11672592163085938,0.10763216018676758,0.09240126609802246,0.6810050010681152,0.07352399826049805,0.07328081130981445,0.07255816459655762,0.07450342178344727,0.07277774810791016 diff --git a/results/combined/merges_timed/apache/olingo-odata2.csv b/results/combined/merges_timed/apache/olingo-odata2.csv index 10cd30268b..ffff6fcbe3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,True,22,156,649,2,True,22,Tests_passed,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,True,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,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,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,91751e75ec3ec44472c27ad952d5585a01e844c3f6eae90c1015e67b8a3d4b7f,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,0.0696265697479248,0.06908702850341797,0.07357001304626465,0.030689716339111328,0.0803532600402832,0.055985212326049805,0.06085944175720215,0.19208192825317383,0.13961410522460938,0.04734063148498535,1.1117355823516846,0.062339067459106445,0.09310603141784668,0.06347942352294922,0.09285306930541992,0.09752702713012695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,True,22,156,649,2,True,22,Tests_passed,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,True,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,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,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,91751e75ec3ec44472c27ad952d5585a01e844c3f6eae90c1015e67b8a3d4b7f,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,Tests_failed,7627bf7e2a6c0328b6c1090d839e9d7f8623177605871b005dc1b96eec018a4c,0.0696265697479248,0.06908702850341797,0.07357001304626465,0.030689716339111328,0.0803532600402832,0.055985212326049805,0.06085944175720215,0.19208192825317383,0.13961410522460938,0.04734063148498535,1.1117355823516846,0.062339067459106445,0.09310603141784668,0.06347942352294922,0.09285306930541992,0.09752702713012695,0.09496259689331055,0.09006619453430176,0.09807205200195312,0.0983114242553711,0.09807372093200684,0.0997476577758789,0.0954442024230957,0.14316105842590332,0.1338059902191162,0.11325359344482422,1.3097589015960693,0.09684967994689941,0.09328818321228027,0.09417510032653809,0.09671425819396973,0.09357476234436035 diff --git a/results/combined/merges_timed/apache/olingo-odata4.csv b/results/combined/merges_timed/apache/olingo-odata4.csv index ce701c4192..4c9481a647 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -40,refs/heads/master,483ee9de15cf8bbcc18e2560496724b06be76cf2,0ce0a88be2766261c6d30665b9b9a2576b546c08,3584e1d71d260a44f9aa685503bdde2d62ad322f,,True,True,True,414,2569,23236.0,6,True,409,Tests_passed,40e26605249c22baf44606775b5cab512d21cd2e2d5dcc38090482c62f4d6f64,True,Tests_passed,5f04cdc200f8d8b71ca7db68494fd6760d45d046fba443849104cf69a68677ac,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,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,0ec71aec798ca78d86fc017abb7d859350a2492ce902eef0a1f25535fb2b605f,Merge_failed,d6288adeee39e07e3d82e55c7c8e63c0843056ea4bb4d75255e6a586f97f22fb,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,a32b8ffb023fb10e51a95356d90700862167227b7e7b7ffcc3888eca921db026,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,6f28d27aabc2112e6aef3e56aad0077219bcf9f3e8a9cf67a14c7fb7e0f7ae8e,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,0.0724339485168457,0.06787967681884766,0.07810664176940918,0.0861806869506836,0.0795741081237793,0.08736896514892578,0.07506895065307617,0.4585099220275879,0.31332993507385254,10.227067470550537,14.351024389266968,0.16382598876953125,0.18610835075378418,0.14890408515930176,0.1959514617919922,0.1933584213256836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +40,refs/heads/master,483ee9de15cf8bbcc18e2560496724b06be76cf2,0ce0a88be2766261c6d30665b9b9a2576b546c08,3584e1d71d260a44f9aa685503bdde2d62ad322f,,True,True,True,414,2569,23236.0,6,True,409,Tests_passed,40e26605249c22baf44606775b5cab512d21cd2e2d5dcc38090482c62f4d6f64,True,Tests_passed,5f04cdc200f8d8b71ca7db68494fd6760d45d046fba443849104cf69a68677ac,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,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,0ec71aec798ca78d86fc017abb7d859350a2492ce902eef0a1f25535fb2b605f,Merge_failed,d6288adeee39e07e3d82e55c7c8e63c0843056ea4bb4d75255e6a586f97f22fb,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,a32b8ffb023fb10e51a95356d90700862167227b7e7b7ffcc3888eca921db026,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,6f28d27aabc2112e6aef3e56aad0077219bcf9f3e8a9cf67a14c7fb7e0f7ae8e,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,0.0724339485168457,0.06787967681884766,0.07810664176940918,0.0861806869506836,0.0795741081237793,0.08736896514892578,0.07506895065307617,0.4585099220275879,0.31332993507385254,10.227067470550537,14.351024389266968,0.16382598876953125,0.18610835075378418,0.14890408515930176,0.1959514617919922,0.1933584213256836,0.19125986099243164,0.19588947296142578,0.2003154754638672,0.20877695083618164,0.21956491470336914,0.21104884147644043,0.2043466567993164,0.3135049343109131,0.32708001136779785,11.239806890487671,15.499846696853638,0.19054484367370605,0.1986093521118164,0.19218039512634277,0.18996691703796387,0.19650983810424805 diff --git a/results/combined/merges_timed/apache/opennlp.csv b/results/combined/merges_timed/apache/opennlp.csv index 262b1d372d..213ae3dc5b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/remotes/origin/pull/428,1f7ecee31581a733dd3af774c5ee464efa21c3d8,53c0e2d19c7ec0026e5ac079119edc6cfbb41332,ea0d6f7d8ae291770385b7f6c263ef433db909cc,,True,True,True,255,2940,11684.0,2,True,255,Tests_passed,d1961a64dfaa60c2d5a2f250968de9456ceb8237e02f79a1c4b953bbb1642eb9,True,Tests_passed,7485e65c7d697200d77f28df439e0df6f025c91034d527bf330e248e848ed734,True,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,b9a02e95505c123b7a7c08a8e78aa745076c7f4a0022e8228bf2dba8e63663c4,Merge_failed,26d7cf42e810a9304adaf3653179e0e2d2079c1a4befb3f597bddc13dcb5b879,Tests_failed,96060e0d71e5dba98954f30d4fd9bd569862fffe633118b1f9b3d1463c5df471,Tests_failed,3d418d13ff5911c09ecebb67a5d5edf6aca73fd7bb3e9515439706f9e327e457,Tests_failed,875de5680f3f2d2f930c8e8e49fbf8541c53556a929b0ffc2931837d6e5408b8,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,e3b410e5a07d3f0d52bf59164455695bec977d75dc92cb98e2afe0322469b8be,Tests_failed,408170e36654853c3e466cf24ded512c0ae4cc71d992aa43f49e8832ff073702,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,0.03857827186584473,0.03744912147521973,0.0417330265045166,0.04748177528381348,0.040277957916259766,0.04324460029602051,0.03714632987976074,0.09695792198181152,0.06531023979187012,0.7701776027679443,2.205427408218384,0.10010075569152832,0.07388615608215332,0.07636666297912598,0.10840559005737305,0.10943412780761719 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/remotes/origin/pull/428,1f7ecee31581a733dd3af774c5ee464efa21c3d8,53c0e2d19c7ec0026e5ac079119edc6cfbb41332,ea0d6f7d8ae291770385b7f6c263ef433db909cc,,True,True,True,255,2940,11684.0,2,True,255,Tests_passed,d1961a64dfaa60c2d5a2f250968de9456ceb8237e02f79a1c4b953bbb1642eb9,True,Tests_passed,7485e65c7d697200d77f28df439e0df6f025c91034d527bf330e248e848ed734,True,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,b9a02e95505c123b7a7c08a8e78aa745076c7f4a0022e8228bf2dba8e63663c4,Merge_failed,26d7cf42e810a9304adaf3653179e0e2d2079c1a4befb3f597bddc13dcb5b879,Tests_failed,96060e0d71e5dba98954f30d4fd9bd569862fffe633118b1f9b3d1463c5df471,Tests_failed,3d418d13ff5911c09ecebb67a5d5edf6aca73fd7bb3e9515439706f9e327e457,Tests_failed,875de5680f3f2d2f930c8e8e49fbf8541c53556a929b0ffc2931837d6e5408b8,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,e3b410e5a07d3f0d52bf59164455695bec977d75dc92cb98e2afe0322469b8be,Tests_failed,408170e36654853c3e466cf24ded512c0ae4cc71d992aa43f49e8832ff073702,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,Tests_failed,2d909e3c65e24a0121fd6a36dc67efa27fd2f259a62b3c99e2a2d7790fe378bf,0.03857827186584473,0.03744912147521973,0.0417330265045166,0.04748177528381348,0.040277957916259766,0.04324460029602051,0.03714632987976074,0.09695792198181152,0.06531023979187012,0.7701776027679443,2.205427408218384,0.10010075569152832,0.07388615608215332,0.07636666297912598,0.10840559005737305,0.10943412780761719,0.10238122940063477,0.10140275955200195,0.10192489624023438,0.10110878944396973,0.10518598556518555,0.10528063774108887,0.10465097427368164,0.14241313934326172,0.1379106044769287,0.8906083106994629,2.364288568496704,0.09998273849487305,0.10177993774414062,0.09876108169555664,0.1007084846496582,0.10307574272155762 diff --git a/results/combined/merges_timed/apache/roller.csv b/results/combined/merges_timed/apache/roller.csv index 943f9316b3..c20700eac8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,,True,2590,2108,,4,True,2590,Tests_passed,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,True,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,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,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,933803b4c9cbdc055d8d98877d0996864705ba54f6e3fff2484ddf7d5b2ba91f,Merge_failed,f7a877176750133a4d68081018006cd91b1c596bf79ed282125f9d1d993c198e,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,1e72d74027b7d14cb7f6901a9bdbc154b6bf78aa5861db8fa3f6efc35da9bf6a,Merge_failed,16491d0d8079ced3de42327e712b776b42373830c98bc0525eebefadb883f8cc,Merge_failed,8a00f3f8254b3ee8e5f35f1ab7a9d2c1a85c86f2e4d4d740100e77ab46a8aaae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,0.085540771484375,0.08616828918457031,0.15108203887939453,0.17418503761291504,0.1502377986907959,0.15017032623291016,0.14823031425476074,0.25634098052978516,0.2529897689819336,0.7700095176696777,0.7495167255401611,0.19605565071105957,0.2926168441772461,0.2297663688659668,0.3534114360809326,0.34804797172546387 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,,True,2590,2108,,4,True,2590,Tests_passed,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,True,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,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,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,933803b4c9cbdc055d8d98877d0996864705ba54f6e3fff2484ddf7d5b2ba91f,Merge_failed,f7a877176750133a4d68081018006cd91b1c596bf79ed282125f9d1d993c198e,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,1e72d74027b7d14cb7f6901a9bdbc154b6bf78aa5861db8fa3f6efc35da9bf6a,Merge_failed,16491d0d8079ced3de42327e712b776b42373830c98bc0525eebefadb883f8cc,Merge_failed,8a00f3f8254b3ee8e5f35f1ab7a9d2c1a85c86f2e4d4d740100e77ab46a8aaae,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,817ad37f3853db56752006893b878635aa182c62895fa560ccf8067a5c83ae83,Merge_failed,cb5a5facf67d612ac9adab00d03c4facddb7697df1a5a3e1688df5a1af752aae,0.085540771484375,0.08616828918457031,0.15108203887939453,0.17418503761291504,0.1502377986907959,0.15017032623291016,0.14823031425476074,0.25634098052978516,0.2529897689819336,0.7700095176696777,0.7495167255401611,0.19605565071105957,0.2926168441772461,0.2297663688659668,0.3534114360809326,0.34804797172546387,0.33704543113708496,0.3265829086303711,0.3911464214324951,0.3940889835357666,0.39504361152648926,0.3998837471008301,0.39367008209228516,0.42111897468566895,0.41668128967285156,1.0680835247039795,1.0356848239898682,0.3329131603240967,0.3237464427947998,0.32799625396728516,0.3317372798919678,0.3296990394592285 diff --git a/results/combined/merges_timed/apache/shiro.csv b/results/combined/merges_timed/apache/shiro.csv index 119e8d7e81..f9aae800c3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,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,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,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,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,3691113f7aac39744ddae262eaa42d96da08650dd1d6b2c4152bb2395fc9c36a,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.024932861328125,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.12031435966491699,0.795459508895874,0.46579861640930176,0.049971818923950195,0.07387495040893555,0.04946422576904297,0.07590460777282715,0.07349777221679688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,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,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,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,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,3691113f7aac39744ddae262eaa42d96da08650dd1d6b2c4152bb2395fc9c36a,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.024932861328125,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.12031435966491699,0.795459508895874,0.46579861640930176,0.049971818923950195,0.07387495040893555,0.04946422576904297,0.07590460777282715,0.07349777221679688,0.07268667221069336,0.07090139389038086,0.0737917423248291,0.07540488243103027,0.07374906539916992,0.07510852813720703,0.07643938064575195,0.11272072792053223,0.10348892211914062,0.8155453205108643,0.5107550621032715,0.06917858123779297,0.07258987426757812,0.07243871688842773,0.07142877578735352,0.07285428047180176 diff --git a/results/combined/merges_timed/apache/tomcat-maven-plugin.csv b/results/combined/merges_timed/apache/tomcat-maven-plugin.csv index 8b3c307392..c7fdc89b75 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,True,101,145,13939,3,True,101,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,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,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,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,e22b3320f7f314b745d0affe58a69c49c8865ebfeeb280e6810bcb1e54bcecef,Tests_failed,f3c078261612c46c836c655535f1d07d1760f38efd6068dd62dcca25a03d5b29,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.029902219772338867,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.15503835678100586,2.104686975479126,0.8381228446960449,0.06385993957519531,0.11489510536193848,0.10923337936401367,0.14283204078674316,0.13971924781799316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,True,101,145,13939,3,True,101,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,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,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,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,e22b3320f7f314b745d0affe58a69c49c8865ebfeeb280e6810bcb1e54bcecef,Tests_failed,f3c078261612c46c836c655535f1d07d1760f38efd6068dd62dcca25a03d5b29,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.029902219772338867,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.15503835678100586,2.104686975479126,0.8381228446960449,0.06385993957519531,0.11489510536193848,0.10923337936401367,0.14283204078674316,0.13971924781799316,0.10471582412719727,0.10902166366577148,0.12446856498718262,0.14277863502502441,0.1587390899658203,0.16785669326782227,0.16802573204040527,0.21112585067749023,0.16751551628112793,2.094993829727173,0.9067287445068359,0.1085209846496582,0.12686538696289062,0.15333318710327148,0.16779065132141113,0.1609201431274414 diff --git a/results/combined/merges_timed/appendium/flatpack.csv b/results/combined/merges_timed/appendium/flatpack.csv index df98bcd0de..dc936d52f0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,False,True,3,3,4,2,True,3,Tests_passed,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,True,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,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,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,eeabc3fda79ddf5c45f898df5abb19e3e9d272a35c3f96b101a4db0426763ed1,Tests_failed,9086171ad8fff13210820005bc3c3f84f9c34a7620e131b0187025069d981f21,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,0.011675596237182617,0.011746644973754883,0.04848337173461914,0.08511853218078613,0.010799646377563477,0.04702186584472656,0.011513948440551758,0.08601665496826172,0.10047125816345215,1.2385060787200928,0.39307427406311035,0.15514731407165527,0.19067883491516113,0.03475308418273926,0.06577682495117188,0.183152437210083 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,False,True,3,3,4,2,True,3,Tests_passed,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,True,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,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,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,eeabc3fda79ddf5c45f898df5abb19e3e9d272a35c3f96b101a4db0426763ed1,Tests_failed,9086171ad8fff13210820005bc3c3f84f9c34a7620e131b0187025069d981f21,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,Tests_passed,695428d086447e7cc3a3743ce54e9f50ab38fa48686631fb1a25d26ef3e47cde,0.011675596237182617,0.011746644973754883,0.04848337173461914,0.08511853218078613,0.010799646377563477,0.04702186584472656,0.011513948440551758,0.08601665496826172,0.10047125816345215,1.2385060787200928,0.39307427406311035,0.15514731407165527,0.19067883491516113,0.03475308418273926,0.06577682495117188,0.183152437210083,0.09534001350402832,0.06191873550415039,0.21115827560424805,0.06591081619262695,0.20683932304382324,0.1957540512084961,0.06411862373352051,0.2746436595916748,0.23932480812072754,1.5257866382598877,0.504511833190918,0.17235851287841797,0.06255197525024414,0.18809032440185547,0.17906570434570312,0.06313538551330566 diff --git a/results/combined/merges_timed/appstatus/appstatus.csv b/results/combined/merges_timed/appstatus/appstatus.csv index b4e7c36b36..c35907d2ba 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,True,7,60,233,184,True,185,Tests_passed,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,True,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,True,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7ed8922ac73c7891f8ea4afbc08c014332d53294a6b9136b71fad615b17d80cd,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7a2be716da3b0e35cd5c9e17808232a1eb55a5f39ae17920ed5e946aa5853cdf,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,0.0669708251953125,0.05449390411376953,0.05269598960876465,0.04672646522521973,0.06444764137268066,0.0467219352722168,0.06419539451599121,0.43190956115722656,0.3472769260406494,3.497061014175415,0.5900299549102783,0.06415963172912598,0.08465862274169922,0.07855224609375,0.0927572250366211,0.08837080001831055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,True,7,60,233,184,True,185,Tests_passed,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,True,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,True,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7ed8922ac73c7891f8ea4afbc08c014332d53294a6b9136b71fad615b17d80cd,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7a2be716da3b0e35cd5c9e17808232a1eb55a5f39ae17920ed5e946aa5853cdf,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,0.0669708251953125,0.05449390411376953,0.05269598960876465,0.04672646522521973,0.06444764137268066,0.0467219352722168,0.06419539451599121,0.43190956115722656,0.3472769260406494,3.497061014175415,0.5900299549102783,0.06415963172912598,0.08465862274169922,0.07855224609375,0.0927572250366211,0.08837080001831055,0.08905196189880371,0.09253501892089844,0.07960748672485352,0.09909725189208984,0.09851288795471191,0.0968329906463623,0.0977027416229248,0.1849501132965088,0.2436366081237793,3.8084957599639893,0.7293705940246582,0.08985257148742676,0.09000039100646973,0.08908367156982422,0.09383988380432129,0.08015871047973633 diff --git a/results/combined/merges_timed/arcbees/arcbees-archetypes.csv b/results/combined/merges_timed/arcbees/arcbees-archetypes.csv index 9f17d2af40..b33a10d795 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,True,132,276,692,3,True,132,Tests_passed,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,True,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,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,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,a0f65412de8b7d361062cdd991c0ff4b2a59261be0f8b32d85e41a20149e60dc,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,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,41c87a1e6d08751b480ebbc81389e31011b1075f04efd5a3a73b675daeb3d9ab,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,0.02028942108154297,0.020314455032348633,0.03157997131347656,0.03168845176696777,0.02295207977294922,0.025414705276489258,0.03133535385131836,0.06444048881530762,0.12803959846496582,0.6241278648376465,0.6962878704071045,0.05483722686767578,0.10467195510864258,0.05659341812133789,0.10111522674560547,0.09927606582641602 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,True,132,276,692,3,True,132,Tests_passed,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,True,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,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,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,a0f65412de8b7d361062cdd991c0ff4b2a59261be0f8b32d85e41a20149e60dc,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,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,41c87a1e6d08751b480ebbc81389e31011b1075f04efd5a3a73b675daeb3d9ab,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,0.02028942108154297,0.020314455032348633,0.03157997131347656,0.03168845176696777,0.02295207977294922,0.025414705276489258,0.03133535385131836,0.06444048881530762,0.12803959846496582,0.6241278648376465,0.6962878704071045,0.05483722686767578,0.10467195510864258,0.05659341812133789,0.10111522674560547,0.09927606582641602,0.10219287872314453,0.1017308235168457,0.10623764991760254,0.1049044132232666,0.10465049743652344,0.09912896156311035,0.10121607780456543,0.1616687774658203,0.15926122665405273,0.7714405059814453,0.8233568668365479,0.09802365303039551,0.0996091365814209,0.09556841850280762,0.10099911689758301,0.1034402847290039 diff --git a/results/combined/merges_timed/arcbees/gwtchosen.csv b/results/combined/merges_timed/arcbees/gwtchosen.csv index 1fc6c25b94..ea9bdc4632 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -106,refs/heads/master,d5d56191cde632b6ce9f22b6853ca259916891ae,b59b3895a44f81599ae677d9844ba74307c9d976,ae85f4e58a75ad64e4d2b1634f151f153a2b9f77,,True,True,Tests_passed,49a9f21dcee43a001f2555df84bfa40e6c854efa884329346627830df8eac79d,True,8,91,3672,2,True,Tests_passed,7c15d3cc4a12da563d7905dc2e5378d38b82dd90fcb9b459ec1abbcb5cf78daf,True,8,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,78382166aba9bf525c877700b1e3daeaaa1b34582f63edc8dcc1b98651532e7a,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,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,78382166aba9bf525c877700b1e3daeaaa1b34582f63edc8dcc1b98651532e7a,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,0.015401601791381836,0.015916109085083008,0.017220735549926758,0.026527881622314453,0.017483949661254883,0.017423391342163086,0.01749277114868164,0.04494524002075195,0.0709989070892334,0.01885056495666504,0.6587989330291748,0.04750943183898926,0.07738780975341797,0.04737401008605957,0.0807335376739502,0.07910299301147461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +106,refs/heads/master,d5d56191cde632b6ce9f22b6853ca259916891ae,b59b3895a44f81599ae677d9844ba74307c9d976,ae85f4e58a75ad64e4d2b1634f151f153a2b9f77,,True,True,Tests_passed,49a9f21dcee43a001f2555df84bfa40e6c854efa884329346627830df8eac79d,True,8,91,3672,2,True,Tests_passed,7c15d3cc4a12da563d7905dc2e5378d38b82dd90fcb9b459ec1abbcb5cf78daf,True,8,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,78382166aba9bf525c877700b1e3daeaaa1b34582f63edc8dcc1b98651532e7a,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,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,78382166aba9bf525c877700b1e3daeaaa1b34582f63edc8dcc1b98651532e7a,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,0.015401601791381836,0.015916109085083008,0.017220735549926758,0.026527881622314453,0.017483949661254883,0.017423391342163086,0.01749277114868164,0.04494524002075195,0.0709989070892334,0.01885056495666504,0.6587989330291748,0.04750943183898926,0.07738780975341797,0.04737401008605957,0.0807335376739502,0.07910299301147461,0.07365059852600098,0.0738365650177002,0.07752823829650879,0.07712030410766602,0.0759880542755127,0.08064603805541992,0.07564878463745117,0.11700105667114258,0.10562419891357422,0.08928894996643066,0.7015128135681152,0.07389330863952637,0.07617998123168945,0.07375717163085938,0.07690572738647461,0.07216691970825195 diff --git a/results/combined/merges_timed/arcbees/universal-analytics.csv b/results/combined/merges_timed/arcbees/universal-analytics.csv index be02971bef..bc3892531b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,True,39,361,1600,8,True,39,Tests_passed,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,True,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,True,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,781bcf97efd2cc2798964ae6bf73ad40bd9a301f511a617fc10762d089399f6c,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,Merge_failed,21398a8aa39effae44bbe512aaa6066457478a80a6c294982596d88d7d727296,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,3ed98dcbab8e8b47ff3029f6a746630e024ff2bb5929e00bbae762370f4b2246,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,33fecd04a9f76c93592eb3f6c7de905e2760dd4432d8631f0d149ec0ad53e65e,Merge_failed,c9a33b964556f6c5c5b4c852526719d76d51c3142a28aeeef796a946ac7b295f,Merge_failed,1f55aa318214f44008f87ea891ab8a73918abdec167503224bdf175eb2cbe3cf,Tests_failed,bd3c11bcd2c1d997c27711ae82db098029b4c2be908d5709084ea2043839a0e4,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,0.038987159729003906,0.03702735900878906,0.04109454154968262,0.016808509826660156,0.043276071548461914,0.04789113998413086,0.046625375747680664,0.5518481731414795,0.45903682708740234,3.4041261672973633,0.5002834796905518,0.07314181327819824,0.12640666961669922,0.0695798397064209,0.13897991180419922,0.14030814170837402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,True,39,361,1600,8,True,39,Tests_passed,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,True,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,True,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,781bcf97efd2cc2798964ae6bf73ad40bd9a301f511a617fc10762d089399f6c,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,Merge_failed,21398a8aa39effae44bbe512aaa6066457478a80a6c294982596d88d7d727296,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,3ed98dcbab8e8b47ff3029f6a746630e024ff2bb5929e00bbae762370f4b2246,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,ada5bc4ac595e7ce3cd9574d6ebb7c21efcb75b82920715e005a6f0a67f24a34,Merge_failed,33fecd04a9f76c93592eb3f6c7de905e2760dd4432d8631f0d149ec0ad53e65e,Merge_failed,c9a33b964556f6c5c5b4c852526719d76d51c3142a28aeeef796a946ac7b295f,Merge_failed,1f55aa318214f44008f87ea891ab8a73918abdec167503224bdf175eb2cbe3cf,Tests_failed,bd3c11bcd2c1d997c27711ae82db098029b4c2be908d5709084ea2043839a0e4,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,Merge_failed,ba2d93debcc3e54071ec3d336317e8f32bc3a7787e7c20d063fe10620e69c696,0.038987159729003906,0.03702735900878906,0.04109454154968262,0.016808509826660156,0.043276071548461914,0.04789113998413086,0.046625375747680664,0.5518481731414795,0.45903682708740234,3.4041261672973633,0.5002834796905518,0.07314181327819824,0.12640666961669922,0.0695798397064209,0.13897991180419922,0.14030814170837402,0.13836431503295898,0.14104628562927246,0.1404569149017334,0.14026260375976562,0.14189624786376953,0.14142918586730957,0.143388032913208,0.26823902130126953,0.3303382396697998,3.847377300262451,0.6971099376678467,0.141463041305542,0.14162850379943848,0.14181804656982422,0.14275717735290527,0.14173436164855957 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 d23856086c..16701069e4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,True,14,50,333,4,True,14,Tests_passed,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,True,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,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,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,Tests_failed,36ad5012e153106ac756927f6c485cf596988b2cb3f888c67be5d01ddbfc86ea,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,3a6bce401311e7aa0afe51d39cdaaf79bf98c63f2a9dd0bba9a441fb7249561b,Merge_failed,1bffad0196e9483fcb5cfff4baac5a3cc9db849cde47150c0a6200a49479bd01,Tests_failed,bae80f7dacbfffec61f84aff50b2d4b8b8a9c7cecb5a8f17db2b441850ed57e7,Tests_failed,497c8b68725b54a98141344c35423c657831e04758d18a552f94b2ddf3b3ccc5,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,0.04118752479553223,0.039116859436035156,0.05435538291931152,0.02094745635986328,0.04249978065490723,0.05347084999084473,0.03549695014953613,0.2882046699523926,0.23501873016357422,1.321315050125122,0.4201507568359375,0.07224178314208984,0.08320021629333496,0.05948305130004883,0.08310866355895996,0.08258485794067383 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,True,14,50,333,4,True,14,Tests_passed,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,True,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,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,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,Tests_failed,36ad5012e153106ac756927f6c485cf596988b2cb3f888c67be5d01ddbfc86ea,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,b3a28e4505cddbc3a2ef53c52f9122ff9caba30db0453949db9ef7374bfb7d0b,Merge_failed,3a6bce401311e7aa0afe51d39cdaaf79bf98c63f2a9dd0bba9a441fb7249561b,Merge_failed,1bffad0196e9483fcb5cfff4baac5a3cc9db849cde47150c0a6200a49479bd01,Tests_failed,bae80f7dacbfffec61f84aff50b2d4b8b8a9c7cecb5a8f17db2b441850ed57e7,Tests_failed,497c8b68725b54a98141344c35423c657831e04758d18a552f94b2ddf3b3ccc5,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,Merge_failed,be474e91f490d974d72d8368653c141a98e415235bb5d2b3746d5289361e675e,0.04118752479553223,0.039116859436035156,0.05435538291931152,0.02094745635986328,0.04249978065490723,0.05347084999084473,0.03549695014953613,0.2882046699523926,0.23501873016357422,1.321315050125122,0.4201507568359375,0.07224178314208984,0.08320021629333496,0.05948305130004883,0.08310866355895996,0.08258485794067383,0.07954692840576172,0.08101987838745117,0.08084416389465332,0.07907509803771973,0.08099913597106934,0.08069968223571777,0.08053779602050781,0.14684796333312988,0.17118167877197266,1.4404549598693848,0.5102064609527588,0.08002567291259766,0.08037376403808594,0.07850122451782227,0.08189725875854492,0.07701349258422852 diff --git a/results/combined/merges_timed/arimus/jmimemagic.csv b/results/combined/merges_timed/arimus/jmimemagic.csv index 7b14fb8b16..6e7e9bc56d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,False,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,True,2,1,18,2,True,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,True,2,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,979001eccde34158f1f6cd65cbc9d653bf43049328eed8d76ad400f4fb565f94,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,6f9b157d316d64d40c551340790aa49c75f033dd6b241fdf5cb473a21a2b593e,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,0.02512812614440918,0.01781487464904785,0.022598743438720703,0.02222609519958496,0.026401758193969727,0.023956775665283203,0.026828289031982422,0.12181258201599121,0.10940170288085938,1.1330008506774902,0.35521912574768066,0.04093313217163086,0.06663799285888672,0.04107999801635742,0.0669710636138916,0.06674909591674805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,False,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,True,2,1,18,2,True,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,True,2,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,979001eccde34158f1f6cd65cbc9d653bf43049328eed8d76ad400f4fb565f94,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,6f9b157d316d64d40c551340790aa49c75f033dd6b241fdf5cb473a21a2b593e,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,0.02512812614440918,0.01781487464904785,0.022598743438720703,0.02222609519958496,0.026401758193969727,0.023956775665283203,0.026828289031982422,0.12181258201599121,0.10940170288085938,1.1330008506774902,0.35521912574768066,0.04093313217163086,0.06663799285888672,0.04107999801635742,0.0669710636138916,0.06674909591674805,0.06280875205993652,0.06440186500549316,0.0691530704498291,0.06748652458190918,0.06456446647644043,0.06450271606445312,0.0670163631439209,0.09779667854309082,0.10312318801879883,1.0676188468933105,0.37987613677978516,0.06772470474243164,0.06436753273010254,0.06548738479614258,0.06651854515075684,0.06708621978759766 diff --git a/results/combined/merges_timed/arnim/hdp.csv b/results/combined/merges_timed/arnim/hdp.csv index 56c08363cb..c96b9eb74f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,True,True,Tests_passed,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,True,18,43,1077,3,True,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,True,18,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,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,0.038593292236328125,0.038393259048461914,0.04069232940673828,0.013545036315917969,0.039173126220703125,0.04268193244934082,0.04114842414855957,0.16840457916259766,0.04257822036743164,0.03862118721008301,0.47010326385498047,0.03999662399291992,0.04300236701965332,0.040673017501831055,0.04252314567565918,0.04313826560974121 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,True,True,Tests_passed,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,True,18,43,1077,3,True,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,True,18,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,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,0.038593292236328125,0.038393259048461914,0.04069232940673828,0.013545036315917969,0.039173126220703125,0.04268193244934082,0.04114842414855957,0.16840457916259766,0.04257822036743164,0.03862118721008301,0.47010326385498047,0.03999662399291992,0.04300236701965332,0.040673017501831055,0.04252314567565918,0.04313826560974121,0.04140448570251465,0.04088950157165527,0.041368961334228516,0.041376590728759766,0.040375709533691406,0.04117321968078613,0.04063534736633301,0.07506823539733887,0.048154354095458984,0.053563594818115234,0.518132209777832,0.04048967361450195,0.04139399528503418,0.04113125801086426,0.04120826721191406,0.0404970645904541 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 313584e05b..6197e5762f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,True,7,37,340,5,True,7,Tests_passed,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,True,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,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,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,c4129ab627485ea3964a1215c180eea0a0f98b29ef4c6dbf27d8e46719d972d7,Merge_failed,c4129ab627485ea3964a1215c180eea0a0f98b29ef4c6dbf27d8e46719d972d7,Merge_failed,30e34d4578fcbc839d0ed3c877695c07d1492689d06b814dd6c006709c218c65,Merge_failed,8ecd49578d7d025bc34499eda947cfb302cab77102a9d2d4a8e37e9cb00042cb,Merge_failed,ac0a938d8efd12553a17f52f3f7bca71b5855ee3fe2fac45006ac1142378c6ba,Merge_failed,27f4e7960e4f216b9d85d8d195ea0e17186db29baf0dcfa5c7a5c20be080ca03,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,0.04127216339111328,0.04114794731140137,0.009686946868896484,0.012978315353393555,0.03345441818237305,0.038841962814331055,0.03975033760070801,0.3564941883087158,0.31229376792907715,1.3407800197601318,0.25029587745666504,0.07286500930786133,0.07439684867858887,0.07587361335754395,0.08372211456298828,0.08388519287109375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,True,7,37,340,5,True,7,Tests_passed,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,True,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,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,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,Merge_failed,c4129ab627485ea3964a1215c180eea0a0f98b29ef4c6dbf27d8e46719d972d7,Merge_failed,c4129ab627485ea3964a1215c180eea0a0f98b29ef4c6dbf27d8e46719d972d7,Merge_failed,30e34d4578fcbc839d0ed3c877695c07d1492689d06b814dd6c006709c218c65,Merge_failed,8ecd49578d7d025bc34499eda947cfb302cab77102a9d2d4a8e37e9cb00042cb,Merge_failed,ac0a938d8efd12553a17f52f3f7bca71b5855ee3fe2fac45006ac1142378c6ba,Merge_failed,27f4e7960e4f216b9d85d8d195ea0e17186db29baf0dcfa5c7a5c20be080ca03,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,8502c7865cc538a135b8c5ef8f3710d85a94590d2db8c3608d2b21a89f235979,Merge_failed,47bcecb9515f650378c6e12f8250eee66ed0a9b7822e2fbfcb654f15b73774fe,0.04127216339111328,0.04114794731140137,0.009686946868896484,0.012978315353393555,0.03345441818237305,0.038841962814331055,0.03975033760070801,0.3564941883087158,0.31229376792907715,1.3407800197601318,0.25029587745666504,0.07286500930786133,0.07439684867858887,0.07587361335754395,0.08372211456298828,0.08388519287109375,0.08713150024414062,0.08568215370178223,0.08569955825805664,0.08273649215698242,0.09664297103881836,0.09700465202331543,0.08421063423156738,0.1751418113708496,0.21996378898620605,1.5789940357208252,0.339508056640625,0.0844879150390625,0.08511519432067871,0.08309721946716309,0.08695292472839355,0.08177971839904785 diff --git a/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv b/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv index 69a74f42bd..695332ca7f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,True,31,139,978,2,True,31,Tests_passed,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,True,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,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,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,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,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,ca69930752cb7eec225a417fa24fda5e36ac2f337222b5923e1431ed37ad11e4,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,0.011631011962890625,0.011912107467651367,0.012829780578613281,0.019521474838256836,0.012661457061767578,0.012714624404907227,0.01272439956665039,0.038477420806884766,0.06759476661682129,0.8417479991912842,0.5748295783996582,0.036898136138916016,0.06359601020812988,0.038748979568481445,0.06322097778320312,0.06273746490478516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,True,31,139,978,2,True,31,Tests_passed,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,True,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,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,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,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,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,ca69930752cb7eec225a417fa24fda5e36ac2f337222b5923e1431ed37ad11e4,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,0.011631011962890625,0.011912107467651367,0.012829780578613281,0.019521474838256836,0.012661457061767578,0.012714624404907227,0.01272439956665039,0.038477420806884766,0.06759476661682129,0.8417479991912842,0.5748295783996582,0.036898136138916016,0.06359601020812988,0.038748979568481445,0.06322097778320312,0.06273746490478516,0.06113624572753906,0.06078934669494629,0.06075024604797363,0.06145930290222168,0.06174969673156738,0.06231975555419922,0.06252837181091309,0.09412527084350586,0.08986592292785645,0.933758020401001,0.6228041648864746,0.05952024459838867,0.06076526641845703,0.061571598052978516,0.061238765716552734,0.05945873260498047 diff --git a/results/combined/merges_timed/arturmkrtchyan/iban4j.csv b/results/combined/merges_timed/arturmkrtchyan/iban4j.csv index 6470466405..cfe498e3f4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,True,False,True,6,18,71,2,True,6,Tests_passed,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,True,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,True,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,c8b16bb4e0db3b5eb13b422624c3016d7eca9edeb7b572151a475263db7e3dd6,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,8594dd4e97c53f54c075f88699126aea9c0cc0d84287c0caa37aacc0da1d1099,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,0.04063677787780762,0.043109893798828125,0.03419017791748047,0.015228748321533203,0.046146392822265625,0.03522968292236328,0.0422213077545166,0.17344331741333008,0.12125778198242188,0.9867944717407227,0.4022972583770752,0.0419306755065918,0.041872262954711914,0.041498661041259766,0.04285788536071777,0.042719125747680664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,True,False,True,6,18,71,2,True,6,Tests_passed,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,True,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,True,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,c8b16bb4e0db3b5eb13b422624c3016d7eca9edeb7b572151a475263db7e3dd6,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,8594dd4e97c53f54c075f88699126aea9c0cc0d84287c0caa37aacc0da1d1099,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,0.04063677787780762,0.043109893798828125,0.03419017791748047,0.015228748321533203,0.046146392822265625,0.03522968292236328,0.0422213077545166,0.17344331741333008,0.12125778198242188,0.9867944717407227,0.4022972583770752,0.0419306755065918,0.041872262954711914,0.041498661041259766,0.04285788536071777,0.042719125747680664,0.04416322708129883,0.04269719123840332,0.0425264835357666,0.044463157653808594,0.045740365982055664,0.04407620429992676,0.044199228286743164,0.07778525352478027,0.08328557014465332,1.191040277481079,0.5027368068695068,0.04224085807800293,0.04376697540283203,0.04411578178405762,0.043386220932006836,0.043180227279663086 diff --git a/results/combined/merges_timed/asciidoctor/asciidoclet.csv b/results/combined/merges_timed/asciidoctor/asciidoclet.csv index 9747c767c3..360ba51116 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,True,12,53,409,5,True,12,Tests_passed,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,True,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,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,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,efd7c7b2502b1162ef9b769160b13efbee1932df211ffd9efec916940e1c7e5d,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,0.03784441947937012,0.03348207473754883,0.03914976119995117,0.015505552291870117,0.04182934761047363,0.036245107650756836,0.010811805725097656,0.33919525146484375,0.27611827850341797,0.6074743270874023,0.2902872562408447,0.04170036315917969,0.10335588455200195,0.041361331939697266,0.1044461727142334,0.10518431663513184 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,True,12,53,409,5,True,12,Tests_passed,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,True,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,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,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,efd7c7b2502b1162ef9b769160b13efbee1932df211ffd9efec916940e1c7e5d,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,0.03784441947937012,0.03348207473754883,0.03914976119995117,0.015505552291870117,0.04182934761047363,0.036245107650756836,0.010811805725097656,0.33919525146484375,0.27611827850341797,0.6074743270874023,0.2902872562408447,0.04170036315917969,0.10335588455200195,0.041361331939697266,0.1044461727142334,0.10518431663513184,0.0993185043334961,0.10174131393432617,0.09747719764709473,0.09940457344055176,0.1007380485534668,0.09952616691589355,0.09891414642333984,0.18175339698791504,0.20554208755493164,0.6960146427154541,0.3955106735229492,0.10065102577209473,0.0984959602355957,0.09931612014770508,0.0988152027130127,0.09812426567077637 diff --git a/results/combined/merges_timed/aseldawy/spatialhadoop2.csv b/results/combined/merges_timed/aseldawy/spatialhadoop2.csv index d8e745f2b1..94af39f556 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,True,True,True,4,9,169,3,True,4,Tests_passed,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,True,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,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,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,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,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,8fe4d710d0b4f0ae24671f0398d1dc8b7f24bb756e8407355a05720f064d2660,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,0.044953107833862305,0.047120094299316406,0.040642738342285156,0.016184568405151367,0.042936086654663086,0.05080223083496094,0.04475045204162598,0.22522401809692383,0.1623845100402832,1.593639612197876,0.3349885940551758,0.033658742904663086,0.07711195945739746,0.03322434425354004,0.08196711540222168,0.07579803466796875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,True,True,True,4,9,169,3,True,4,Tests_passed,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,True,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,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,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,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,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,8fe4d710d0b4f0ae24671f0398d1dc8b7f24bb756e8407355a05720f064d2660,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,0.044953107833862305,0.047120094299316406,0.040642738342285156,0.016184568405151367,0.042936086654663086,0.05080223083496094,0.04475045204162598,0.22522401809692383,0.1623845100402832,1.593639612197876,0.3349885940551758,0.033658742904663086,0.07711195945739746,0.03322434425354004,0.08196711540222168,0.07579803466796875,0.07351398468017578,0.0747380256652832,0.07372903823852539,0.0756981372833252,0.0747220516204834,0.07448673248291016,0.07383561134338379,0.12446713447570801,0.12759780883789062,1.6700575351715088,0.4199988842010498,0.07282304763793945,0.07251811027526855,0.0740501880645752,0.07426238059997559,0.07328438758850098 diff --git a/results/combined/merges_timed/astefanutti/metrics-cdi.csv b/results/combined/merges_timed/astefanutti/metrics-cdi.csv index 73d4c2855f..45bd759ea2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,True,123,281,971,7,True,123,Tests_passed,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,True,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,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_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_failed,20af770be73e59ad250e3ab09db5ca6c6160aea87a451c945c79fb0cc9596588,Tests_failed,c1e725b3ff07574549fbf4fe54dcda16c8167efad2056d3e99a7cddc07d52f28,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,0.04180645942687988,0.059825897216796875,0.04744386672973633,0.0244600772857666,0.06501960754394531,0.06337761878967285,0.07181572914123535,0.45502281188964844,0.37776827812194824,3.3867087364196777,1.0238959789276123,0.04373955726623535,0.16609811782836914,0.04183006286621094,0.16582727432250977,0.16221117973327637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,True,123,281,971,7,True,123,Tests_passed,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,True,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,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_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_failed,20af770be73e59ad250e3ab09db5ca6c6160aea87a451c945c79fb0cc9596588,Tests_failed,c1e725b3ff07574549fbf4fe54dcda16c8167efad2056d3e99a7cddc07d52f28,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,2baf157dba531acec02a53dd1358d0fa88c6aec73d37e32f418f734e1d21b686,Tests_passed,055c63f95f2c58432d863ba6400792249cb975ce7a0fb19f90be548013604a6c,0.04180645942687988,0.059825897216796875,0.04744386672973633,0.0244600772857666,0.06501960754394531,0.06337761878967285,0.07181572914123535,0.45502281188964844,0.37776827812194824,3.3867087364196777,1.0238959789276123,0.04373955726623535,0.16609811782836914,0.04183006286621094,0.16582727432250977,0.16221117973327637,0.16682195663452148,0.16811609268188477,0.16574740409851074,0.16682100296020508,0.16630315780639648,0.1634213924407959,0.1638655662536621,0.28792381286621094,0.31912875175476074,3.855560541152954,1.1111109256744385,0.16310739517211914,0.16372108459472656,0.16214370727539062,0.16162800788879395,0.1633617877960205 diff --git a/results/combined/merges_timed/astrapi69/jaulp.wicket.csv b/results/combined/merges_timed/astrapi69/jaulp.wicket.csv index c2c197a56e..44591885ba 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,True,31,165,850,10,True,31,Tests_passed,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,True,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,eb13a08a0ab6630fb2c7162e5679207c07418196228acdab5bfc1c6c1b61a25f,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,233f8fa139425879e9a4e9f2c7233d7807d631e2b9cf027e09314e06658ba27d,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,373e635d8d47e337044f527890cfd910e6f53636c4646d2da638aa6adac42246,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,0.02112412452697754,0.02150273323059082,0.023558616638183594,0.02102375030517578,0.023669004440307617,0.0240323543548584,0.0181124210357666,0.17221760749816895,0.5193483829498291,0.5598175525665283,0.5927152633666992,0.1275615692138672,0.15099000930786133,0.1260077953338623,0.14792442321777344,0.15052008628845215 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,True,31,165,850,10,True,31,Tests_passed,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,True,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,eb13a08a0ab6630fb2c7162e5679207c07418196228acdab5bfc1c6c1b61a25f,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,233f8fa139425879e9a4e9f2c7233d7807d631e2b9cf027e09314e06658ba27d,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,373e635d8d47e337044f527890cfd910e6f53636c4646d2da638aa6adac42246,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,0.02112412452697754,0.02150273323059082,0.023558616638183594,0.02102375030517578,0.023669004440307617,0.0240323543548584,0.0181124210357666,0.17221760749816895,0.5193483829498291,0.5598175525665283,0.5927152633666992,0.1275615692138672,0.15099000930786133,0.1260077953338623,0.14792442321777344,0.15052008628845215,0.14312386512756348,0.14162349700927734,0.14557194709777832,0.14127612113952637,0.14438581466674805,0.14105558395385742,0.14293670654296875,0.2990379333496094,0.39779090881347656,0.7071733474731445,0.7434260845184326,0.14635896682739258,0.1418764591217041,0.14390039443969727,0.14294815063476562,0.14216876029968262 diff --git a/results/combined/merges_timed/ata4/disunity.csv b/results/combined/merges_timed/ata4/disunity.csv index 4000b3f47a..a6d35221ce 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,True,242,336,13397,6,True,242,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,8f507f96ed9bf8b94d7cef0f26f94689e59f7a7c00405fbebbad70c1a17333a2,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.19663286209106445,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.21884918212890625,0.10659098625183105,1.1859915256500244,0.2246401309967041,0.22649812698364258,0.22495317459106445,0.22714591026306152,0.22082233428955078 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,True,242,336,13397,6,True,242,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,8f507f96ed9bf8b94d7cef0f26f94689e59f7a7c00405fbebbad70c1a17333a2,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,6b9394d4113818b38d69113031338b14654717318821a01dac2aed49217097b9,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.19663286209106445,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.21884918212890625,0.10659098625183105,1.1859915256500244,0.2246401309967041,0.22649812698364258,0.22495317459106445,0.22714591026306152,0.22082233428955078,0.21995186805725098,0.21776676177978516,0.29787325859069824,0.30823469161987305,0.29804086685180664,0.3048548698425293,0.2991197109222412,0.35440635681152344,0.34842729568481445,0.2925288677215576,1.1906979084014893,0.22235822677612305,0.21805787086486816,0.217667818069458,0.21550655364990234,0.21761274337768555 diff --git a/results/combined/merges_timed/atam4j/atam4j.csv b/results/combined/merges_timed/atam4j/atam4j.csv index a1e0385673..74b575a77d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,True,17,70,438,3,True,17,Tests_passed,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,True,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,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,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,Merge_failed,c9dfdcd4b8c6821119daa40c50ae3457995fb7fbd7c881492b1b4a0b9de98e64,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,a62462618e38dc722cecf6afbfd3b3eff5be9cf246cf42c80f75209af087d221,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,71a6c017a033fae21a1d2b4df9bc851d44e8e931df0c6fc67260dcd4ca4c8210,Tests_failed,ecbdb1c3560fdff1812eb1cb9e1b44aa7d12e7af416a4bbba49f8b04d7c4ffab,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,0.009353876113891602,0.009544610977172852,0.009859323501586914,0.015596151351928711,0.009802818298339844,0.009476423263549805,0.009590864181518555,0.05025458335876465,0.1328134536743164,0.8956389427185059,0.5330078601837158,0.057625532150268555,0.056056976318359375,0.05530238151550293,0.06019949913024902,0.06042623519897461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,True,17,70,438,3,True,17,Tests_passed,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,True,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,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,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,Merge_failed,c9dfdcd4b8c6821119daa40c50ae3457995fb7fbd7c881492b1b4a0b9de98e64,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,a62462618e38dc722cecf6afbfd3b3eff5be9cf246cf42c80f75209af087d221,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,71a6c017a033fae21a1d2b4df9bc851d44e8e931df0c6fc67260dcd4ca4c8210,Tests_failed,ecbdb1c3560fdff1812eb1cb9e1b44aa7d12e7af416a4bbba49f8b04d7c4ffab,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,d0c5f93fb3bb13f09bb5d4daa7e8aab268c82209a5b16623f4c7b1606ec619e7,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,0.009353876113891602,0.009544610977172852,0.009859323501586914,0.015596151351928711,0.009802818298339844,0.009476423263549805,0.009590864181518555,0.05025458335876465,0.1328134536743164,0.8956389427185059,0.5330078601837158,0.057625532150268555,0.056056976318359375,0.05530238151550293,0.06019949913024902,0.06042623519897461,0.06001400947570801,0.059577226638793945,0.06090283393859863,0.05911970138549805,0.05980205535888672,0.060976505279541016,0.06052517890930176,0.10834383964538574,0.12469720840454102,1.0870997905731201,0.6372952461242676,0.06154966354370117,0.06075549125671387,0.0606689453125,0.058812618255615234,0.060451507568359375 diff --git a/results/combined/merges_timed/athou/commafeed.csv b/results/combined/merges_timed/athou/commafeed.csv index 736cd3a37e..6d197f585f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,True,32,129,751.0,2,True,32,Tests_passed,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,True,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,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,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f16c273a1b1629f4f266faa9eeab8b968298edf323a93ca0ae09726fb0a06148,Tests_failed,9a783a8edbe39f9fecca557d2f9153bcc1d598a3b127fca1053f8716a0252a74,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.021049022674560547,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0884239673614502,1.131885051727295,0.5403134822845459,0.08302950859069824,0.07040691375732422,0.07560539245605469,0.10694766044616699,0.06672096252441406 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,True,32,129,751.0,2,True,32,Tests_passed,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,True,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,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,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f16c273a1b1629f4f266faa9eeab8b968298edf323a93ca0ae09726fb0a06148,Tests_failed,9a783a8edbe39f9fecca557d2f9153bcc1d598a3b127fca1053f8716a0252a74,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,f2e0bc766b645db116340ec1ed3b99304f9e99cc01849bf1ecce07c697e3c0ca,Tests_passed,89ca9db00fad75e12def7d5eca98f1efdd14bd7fb290ba3c266d13c398bcfbd9,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.021049022674560547,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0884239673614502,1.131885051727295,0.5403134822845459,0.08302950859069824,0.07040691375732422,0.07560539245605469,0.10694766044616699,0.06672096252441406,0.10020852088928223,0.06830096244812012,0.10978555679321289,0.06831908226013184,0.10603880882263184,0.10889697074890137,0.06664562225341797,0.16007566452026367,0.10007500648498535,1.04911208152771,0.5892350673675537,0.1058492660522461,0.06478476524353027,0.09855318069458008,0.06812357902526855,0.09497666358947754 diff --git a/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv b/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv index 31340a59ef..85f673163a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,True,42,115,886.0,28,True,44,Tests_passed,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,True,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,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,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,148cdcf0f920ae31e2c6eed6bf0f9bef77eb9e93c07777583184ab9b2b7e6c6e,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,0.06305408477783203,0.06435751914978027,0.05757951736450195,0.028109073638916016,0.04812788963317871,0.06508135795593262,0.04471278190612793,1.698744297027588,1.5434134006500244,0.5253880023956299,0.558056116104126,0.31031250953674316,0.34166765213012695,0.3584122657775879,0.512575626373291,0.5135347843170166 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,True,42,115,886.0,28,True,44,Tests_passed,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,True,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,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,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,148cdcf0f920ae31e2c6eed6bf0f9bef77eb9e93c07777583184ab9b2b7e6c6e,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f3edbeba4e94e739a635f6eee657f282d50118aed25daa6f443729fe2ebd75cb,Tests_passed,f13b8a1e8c9b9ab57bff3c599cb6d9c38ff683d85d36fd2f7f1d0517a5789a8b,0.06305408477783203,0.06435751914978027,0.05757951736450195,0.028109073638916016,0.04812788963317871,0.06508135795593262,0.04471278190612793,1.698744297027588,1.5434134006500244,0.5253880023956299,0.558056116104126,0.31031250953674316,0.34166765213012695,0.3584122657775879,0.512575626373291,0.5135347843170166,0.47129082679748535,0.47608518600463867,0.4858274459838867,0.5056476593017578,0.5114984512329102,0.5084645748138428,0.47699570655822754,0.8650460243225098,1.148200511932373,0.9741694927215576,1.0256619453430176,0.4906749725341797,0.5015172958374023,0.5110423564910889,0.5109515190124512,0.5158481597900391 diff --git a/results/combined/merges_timed/atorstling/bychan.csv b/results/combined/merges_timed/atorstling/bychan.csv index 248ede8e34..fa2b11c3d8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,True,14,57,172,2,True,14,Tests_passed,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,True,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,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,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,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,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,9b84d7d8d68c454388c9567998a7a21f28a6de6ebb6e7a676e22f45a2b3c40e7,Tests_failed,6a35e4bf2a45cba31251873f1ed43915223bd045c98bc1b598e76801821ae27d,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,0.019611597061157227,0.01961660385131836,0.02458477020263672,0.01663064956665039,0.02486276626586914,0.02481698989868164,0.024790287017822266,0.05363583564758301,0.07502889633178711,0.8054416179656982,0.5189142227172852,0.05798149108886719,0.057502031326293945,0.05777788162231445,0.057976722717285156,0.08155989646911621 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,True,14,57,172,2,True,14,Tests_passed,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,True,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,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,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,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,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,9b84d7d8d68c454388c9567998a7a21f28a6de6ebb6e7a676e22f45a2b3c40e7,Tests_failed,6a35e4bf2a45cba31251873f1ed43915223bd045c98bc1b598e76801821ae27d,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,0.019611597061157227,0.01961660385131836,0.02458477020263672,0.01663064956665039,0.02486276626586914,0.02481698989868164,0.024790287017822266,0.05363583564758301,0.07502889633178711,0.8054416179656982,0.5189142227172852,0.05798149108886719,0.057502031326293945,0.05777788162231445,0.057976722717285156,0.08155989646911621,0.08265829086303711,0.0859529972076416,0.08639717102050781,0.05539393424987793,0.09087467193603516,0.05766654014587402,0.0864570140838623,0.12821674346923828,0.11289048194885254,1.0457007884979248,0.6072492599487305,0.05588984489440918,0.0828700065612793,0.05619168281555176,0.08443856239318848,0.08434152603149414 diff --git a/results/combined/merges_timed/attoparser/attoparser.csv b/results/combined/merges_timed/attoparser/attoparser.csv index 9198faeddc..bc0a33364c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,True,9,19,152,2,True,9,Tests_passed,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,True,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,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,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_failed,c93fdb9792765ecd3b355c25540e36eadc31da4ac04256e06cb7ba4d514bb33f,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,0.04937243461608887,0.04807090759277344,0.041295766830444336,0.02494955062866211,0.048183441162109375,0.04696345329284668,0.04155683517456055,0.17593097686767578,0.12469887733459473,0.05480146408081055,0.7976992130279541,0.044777631759643555,0.07444167137145996,0.04484677314758301,0.0760958194732666,0.0784614086151123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,True,9,19,152,2,True,9,Tests_passed,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,True,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,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,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_failed,c93fdb9792765ecd3b355c25540e36eadc31da4ac04256e06cb7ba4d514bb33f,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,Tests_passed,635d80abff046f3a6e103b3347184f19d26cc18a9a6a897f98da8f65ff431af0,0.04937243461608887,0.04807090759277344,0.041295766830444336,0.02494955062866211,0.048183441162109375,0.04696345329284668,0.04155683517456055,0.17593097686767578,0.12469887733459473,0.05480146408081055,0.7976992130279541,0.044777631759643555,0.07444167137145996,0.04484677314758301,0.0760958194732666,0.0784614086151123,0.07055449485778809,0.07133364677429199,0.07280325889587402,0.07302141189575195,0.07202816009521484,0.07025361061096191,0.07055997848510742,0.10994958877563477,0.10513997077941895,0.08796072006225586,0.8246207237243652,0.07004952430725098,0.07079601287841797,0.07092881202697754,0.07316398620605469,0.07355356216430664 diff --git a/results/combined/merges_timed/augustt198/lumen.csv b/results/combined/merges_timed/augustt198/lumen.csv index 57a1f12b4a..177b1f1891 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,True,26,45,457,2,True,26,Tests_passed,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,True,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,True,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,8c09719eb7ad7e3bdf337bfe5e7a2bf38577862fdf08e7a9f39e6121aadba24f,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Tests_failed,a2e891b964d64fdc85a734f6036898f3bc8ffb7b661801ada16ed510a25ba067,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,c51bc821257e8c15be20efbf0db06b810b69dcd1cef46188f5703d764d93a0f8,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,d2b44c85bd5eb554dc4fae150571d34dcc78d2f86578656d533a4dc8e5a7f933,Tests_failed,604d452ee5e682623961bb67c4f841d765b3b20c3164634ab599d3e6dbe68492,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,0.02411675453186035,0.04845404624938965,0.0438690185546875,0.019594192504882812,0.04652833938598633,0.04970526695251465,0.03866100311279297,0.15722870826721191,0.1176455020904541,0.9991409778594971,0.5843617916107178,0.04595518112182617,0.04629349708557129,0.04567456245422363,0.047365665435791016,0.045313119888305664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,True,26,45,457,2,True,26,Tests_passed,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,True,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,True,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,8c09719eb7ad7e3bdf337bfe5e7a2bf38577862fdf08e7a9f39e6121aadba24f,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Tests_failed,a2e891b964d64fdc85a734f6036898f3bc8ffb7b661801ada16ed510a25ba067,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,c51bc821257e8c15be20efbf0db06b810b69dcd1cef46188f5703d764d93a0f8,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,d2b44c85bd5eb554dc4fae150571d34dcc78d2f86578656d533a4dc8e5a7f933,Tests_failed,604d452ee5e682623961bb67c4f841d765b3b20c3164634ab599d3e6dbe68492,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,0.02411675453186035,0.04845404624938965,0.0438690185546875,0.019594192504882812,0.04652833938598633,0.04970526695251465,0.03866100311279297,0.15722870826721191,0.1176455020904541,0.9991409778594971,0.5843617916107178,0.04595518112182617,0.04629349708557129,0.04567456245422363,0.047365665435791016,0.045313119888305664,0.04680204391479492,0.047434329986572266,0.04757881164550781,0.04758858680725098,0.046651601791381836,0.04661870002746582,0.04664301872253418,0.08220219612121582,0.08788132667541504,1.1407170295715332,0.7103826999664307,0.04651999473571777,0.04705166816711426,0.04529094696044922,0.04597210884094238,0.0477902889251709 diff --git a/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv b/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv index 6f19d340cc..0c58f397a8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,True,21,50,999,2,True,21,Tests_passed,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,True,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,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,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,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,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,94831cc025018d41462f9458ebb0fc3094995c906ea66e277a66c27f6998523d,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,0.022207260131835938,0.02221083641052246,0.03868269920349121,0.026571035385131836,0.03306841850280762,0.03737783432006836,0.022181987762451172,0.11318588256835938,0.10169124603271484,0.7066237926483154,0.5040445327758789,0.04801464080810547,0.06738996505737305,0.04856467247009277,0.06982183456420898,0.06939291954040527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,True,21,50,999,2,True,21,Tests_passed,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,True,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,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,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,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,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,94831cc025018d41462f9458ebb0fc3094995c906ea66e277a66c27f6998523d,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,0.022207260131835938,0.02221083641052246,0.03868269920349121,0.026571035385131836,0.03306841850280762,0.03737783432006836,0.022181987762451172,0.11318588256835938,0.10169124603271484,0.7066237926483154,0.5040445327758789,0.04801464080810547,0.06738996505737305,0.04856467247009277,0.06982183456420898,0.06939291954040527,0.06847071647644043,0.06750965118408203,0.07276129722595215,0.07154297828674316,0.07007431983947754,0.06926608085632324,0.07100152969360352,0.10713791847229004,0.10067510604858398,0.6953797340393066,0.5349891185760498,0.07013058662414551,0.07047796249389648,0.06830668449401855,0.06960391998291016,0.06875205039978027 diff --git a/results/combined/merges_timed/auth0/java-jwt.csv b/results/combined/merges_timed/auth0/java-jwt.csv index 7c7b9eb11d..56f0546635 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,True,63,299,2284,10,True,63,Tests_passed,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,True,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,Merge_failed,dd17e0a912c5ffd907ddc266e342c72e467dc91076e1bf0750da1ab115e35e3f,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,e75bc1d7cea61c55cfde5259951aba90861ad5384127181dbec68c0269a434d2,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,a589802d0cbb78ddad9cfe5d694c58bb80f9deb40393d26a3e38a9d485ba480c,Merge_failed,99ec10611ffadb0e481cb6f4228fc24e8b3a5c9abba0058e6bf5e6839f3c533d,Merge_failed,a4d51476e9d039419f522e9b24abea9c601a7921d7f6711d83f662c46ad98e8d,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.025801658630371094,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.5039567947387695,7.294728994369507,0.7811439037322998,0.07187843322753906,0.1946120262145996,0.06722903251647949,0.19549965858459473,0.19791007041931152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,True,63,299,2284,10,True,63,Tests_passed,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,True,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,Merge_failed,dd17e0a912c5ffd907ddc266e342c72e467dc91076e1bf0750da1ab115e35e3f,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,e75bc1d7cea61c55cfde5259951aba90861ad5384127181dbec68c0269a434d2,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,d3c8335b0fcc75a21b92c023269bd5148383378350c65ba21803c4016f31a568,Merge_failed,a589802d0cbb78ddad9cfe5d694c58bb80f9deb40393d26a3e38a9d485ba480c,Merge_failed,99ec10611ffadb0e481cb6f4228fc24e8b3a5c9abba0058e6bf5e6839f3c533d,Merge_failed,a4d51476e9d039419f522e9b24abea9c601a7921d7f6711d83f662c46ad98e8d,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,140cc45632cfd93f8eb533ee04581f1d74840b0efbb5eca2e974cefa8cd63e51,Merge_failed,08c3f896a6734752b00a167519c5a745afb86f2eb1e38cbe3a8396fbdd1bbef4,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.025801658630371094,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.5039567947387695,7.294728994369507,0.7811439037322998,0.07187843322753906,0.1946120262145996,0.06722903251647949,0.19549965858459473,0.19791007041931152,0.18579769134521484,0.18485426902770996,0.18465971946716309,0.18845772743225098,0.18691301345825195,0.18384146690368652,0.18811798095703125,0.34632110595703125,0.41835641860961914,7.202874422073364,1.0058400630950928,0.1889972686767578,0.1840224266052246,0.18435430526733398,0.18311071395874023,0.18639135360717773 diff --git a/results/combined/merges_timed/avaje-common/avaje-agentloader.csv b/results/combined/merges_timed/avaje-common/avaje-agentloader.csv index d3862464fa..db85af2190 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,True,True,Tests_passed,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,True,4,15,61,3,True,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,True,4,True,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,31057f913a038aba6f24db1aba3ea9e6779116409a6c53c0356ccf87630c7abb,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,ec8c2f52e30962b2c3eca8e114492ba74a4ce550c8f36da07525bd6fb6b699ed,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,9542ddd18bb2530a5c7a3860bfa3dd23d656997036bc24dedac727ce850c3e8c,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,0.010302066802978516,0.04129815101623535,0.04221749305725098,0.013993024826049805,0.03776216506958008,0.03697681427001953,0.040988922119140625,0.21999573707580566,0.1797330379486084,0.7902274131774902,0.2698984146118164,0.050957679748535156,0.053687334060668945,0.05093240737915039,0.057479143142700195,0.05547690391540527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,True,True,Tests_passed,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,True,4,15,61,3,True,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,True,4,True,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,31057f913a038aba6f24db1aba3ea9e6779116409a6c53c0356ccf87630c7abb,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,ec8c2f52e30962b2c3eca8e114492ba74a4ce550c8f36da07525bd6fb6b699ed,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,9542ddd18bb2530a5c7a3860bfa3dd23d656997036bc24dedac727ce850c3e8c,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,0.010302066802978516,0.04129815101623535,0.04221749305725098,0.013993024826049805,0.03776216506958008,0.03697681427001953,0.040988922119140625,0.21999573707580566,0.1797330379486084,0.7902274131774902,0.2698984146118164,0.050957679748535156,0.053687334060668945,0.05093240737915039,0.057479143142700195,0.05547690391540527,0.05359053611755371,0.05136752128601074,0.05279731750488281,0.05369234085083008,0.05460047721862793,0.05324220657348633,0.05339670181274414,0.09883522987365723,0.11525416374206543,0.8156352043151855,0.3144679069519043,0.05396389961242676,0.05399060249328613,0.053869009017944336,0.05385136604309082,0.05403447151184082 diff --git a/results/combined/merges_timed/awaisathar/dependensee.csv b/results/combined/merges_timed/awaisathar/dependensee.csv index dda79f2133..4056197168 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,True,True,Tests_passed,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,True,7,30,182,4,True,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,True,7,True,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,83c811f3b7cf490047ff31c0c5b8755c89f0442a3c1cae13e1377d5e6cc493c5,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,Merge_failed,d6b69987b001efff3841039763308281a510c883c27b61ba08126200da9fc55d,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,4b5d30201108672e54e651194c0cc47629978026a6fe0fc68c3ec8c665d26e67,Merge_failed,4b5d30201108672e54e651194c0cc47629978026a6fe0fc68c3ec8c665d26e67,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9b22b42f72f8e698a9867f08c25e46a2a6f1e6dc16ab123176480b279eecbc42,Merge_failed,d2275cc62f13ca5dcb672e9b793cd56db09caecc7a7060125a318560389f7663,Merge_failed,90d886cb8b8979021b0cbee952f90f53cb94132f744958067080d07d44ed4e7a,Tests_failed,021bb17efc0dfbdac145aa576e778d98bcc094916c3c676700f29fe2e63b3296,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,0.03763270378112793,0.041391611099243164,0.010508537292480469,0.013495922088623047,0.031003475189208984,0.03216052055358887,0.013474702835083008,0.3093569278717041,0.2251298427581787,2.2134323120117188,0.32756948471069336,0.06449294090270996,0.06377291679382324,0.0638585090637207,0.06536102294921875,0.0808870792388916 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,True,True,Tests_passed,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,True,7,30,182,4,True,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,True,7,True,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,83c811f3b7cf490047ff31c0c5b8755c89f0442a3c1cae13e1377d5e6cc493c5,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,Merge_failed,d6b69987b001efff3841039763308281a510c883c27b61ba08126200da9fc55d,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,Merge_failed,4b5d30201108672e54e651194c0cc47629978026a6fe0fc68c3ec8c665d26e67,Merge_failed,4b5d30201108672e54e651194c0cc47629978026a6fe0fc68c3ec8c665d26e67,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9b22b42f72f8e698a9867f08c25e46a2a6f1e6dc16ab123176480b279eecbc42,Merge_failed,d2275cc62f13ca5dcb672e9b793cd56db09caecc7a7060125a318560389f7663,Merge_failed,90d886cb8b8979021b0cbee952f90f53cb94132f744958067080d07d44ed4e7a,Tests_failed,021bb17efc0dfbdac145aa576e778d98bcc094916c3c676700f29fe2e63b3296,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,327132548731d5b91ea81b32954c64a1d05a7af4e979fe2ffc0933119d3ba57f,0.03763270378112793,0.041391611099243164,0.010508537292480469,0.013495922088623047,0.031003475189208984,0.03216052055358887,0.013474702835083008,0.3093569278717041,0.2251298427581787,2.2134323120117188,0.32756948471069336,0.06449294090270996,0.06377291679382324,0.0638585090637207,0.06536102294921875,0.0808870792388916,0.06388258934020996,0.07627367973327637,0.06342697143554688,0.0781562328338623,0.06377625465393066,0.06463932991027832,0.06268429756164551,0.1295919418334961,0.16985440254211426,2.3164992332458496,0.4124627113342285,0.06297755241394043,0.06357622146606445,0.0625770092010498,0.06246304512023926,0.07747817039489746 diff --git a/results/combined/merges_timed/awaitility/awaitility.csv b/results/combined/merges_timed/awaitility/awaitility.csv index 4edfe8e0dd..72983aca67 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Tests_timedout,51d8510d5ed040ef94e34f8be2c6198cb98dd31124aa0176ab2fb5539d83c4c6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.020071029663085938,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.17362451553344727,1.2263951301574707,0.30504822731018066,0.05033111572265625,0.07039904594421387,0.0501866340637207,0.06401276588439941,0.07448220252990723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Tests_timedout,51d8510d5ed040ef94e34f8be2c6198cb98dd31124aa0176ab2fb5539d83c4c6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.020071029663085938,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.17362451553344727,1.2263951301574707,0.30504822731018066,0.05033111572265625,0.07039904594421387,0.0501866340637207,0.06401276588439941,0.07448220252990723,0.06961512565612793,0.07114982604980469,0.07258176803588867,0.061263322830200195,0.06723690032958984,0.07280445098876953,0.07061266899108887,0.12266254425048828,0.1359105110168457,1.2626442909240723,0.39987683296203613,0.07135248184204102,0.07105898857116699,0.06821990013122559,0.07246971130371094,0.06346344947814941 diff --git a/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv b/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv index 64dfd6822c..dea1d7a5e1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,True,True,Tests_passed,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,True,8,18,43,3,True,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,True,8,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,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,9fbec3d0a269f729f650277161e4f13621e1f21916434bd137e5dc4d7fb7c2be,Tests_failed,32c3f782f8a213dd15a1b6d4499ed7687d4ae694c70c4e53396c9818e49a54f4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,0.008794307708740234,0.008954286575317383,0.00860905647277832,0.015389680862426758,0.008766889572143555,0.008694171905517578,0.00875997543334961,0.042949676513671875,0.11600112915039062,1.5237650871276855,0.3500802516937256,0.03035426139831543,0.07214784622192383,0.029952526092529297,0.0751945972442627,0.07535481452941895 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,True,True,Tests_passed,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,True,8,18,43,3,True,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,True,8,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,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,9fbec3d0a269f729f650277161e4f13621e1f21916434bd137e5dc4d7fb7c2be,Tests_failed,32c3f782f8a213dd15a1b6d4499ed7687d4ae694c70c4e53396c9818e49a54f4,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,Tests_passed,5283cb53e399d53af60c552256643e6f1a0a0c2c2478b806b60c61cb80b942bd,0.008794307708740234,0.008954286575317383,0.00860905647277832,0.015389680862426758,0.008766889572143555,0.008694171905517578,0.00875997543334961,0.042949676513671875,0.11600112915039062,1.5237650871276855,0.3500802516937256,0.03035426139831543,0.07214784622192383,0.029952526092529297,0.0751945972442627,0.07535481452941895,0.07455110549926758,0.07569479942321777,0.07523488998413086,0.07627129554748535,0.07556438446044922,0.07242822647094727,0.0748281478881836,0.12349748611450195,0.1304028034210205,1.8609490394592285,0.39409470558166504,0.07537198066711426,0.07539010047912598,0.07272577285766602,0.0737009048461914,0.07578444480895996 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 d3f2dda9ad..c9d8dd8e77 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,True,True,Tests_passed,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,True,82,96,278,3,True,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,True,82,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,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,a5682089feffc5c3aed083f68382f77ef96dfcf83c47b47d3f33999402c2c631,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,11c9ee21dd79a118adcce62f7cdfcbff81fbb026f2d683dedefb77f1a269918e,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,0.04653811454772949,0.05917692184448242,0.052701711654663086,0.021367549896240234,0.05758547782897949,0.055236101150512695,0.056145668029785156,0.2175917625427246,0.17685151100158691,0.7141304016113281,0.599341869354248,0.0483701229095459,0.06820917129516602,0.04662609100341797,0.06801962852478027,0.06873559951782227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,True,True,Tests_passed,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,True,82,96,278,3,True,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,True,82,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,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,a5682089feffc5c3aed083f68382f77ef96dfcf83c47b47d3f33999402c2c631,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,11c9ee21dd79a118adcce62f7cdfcbff81fbb026f2d683dedefb77f1a269918e,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,0.04653811454772949,0.05917692184448242,0.052701711654663086,0.021367549896240234,0.05758547782897949,0.055236101150512695,0.056145668029785156,0.2175917625427246,0.17685151100158691,0.7141304016113281,0.599341869354248,0.0483701229095459,0.06820917129516602,0.04662609100341797,0.06801962852478027,0.06873559951782227,0.07007074356079102,0.0685739517211914,0.07041764259338379,0.06941771507263184,0.06722068786621094,0.0691218376159668,0.06942129135131836,0.12146735191345215,0.1280674934387207,0.8108928203582764,0.7253353595733643,0.06870412826538086,0.0682685375213623,0.06741595268249512,0.06827306747436523,0.0677790641784668 diff --git a/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv b/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv index b29abe35e1..c54898f54c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -120,refs/remotes/origin/pull/221,ed1f9d4dca07aefc6c353bd84552f7cc041a63aa,92c0b43b2a391f52f633ebe2eff4c288988b8cfa,f9701f96519acb1bb7e45f3b8cbabdb81f08ed9c,,True,True,True,47,185,1102,3,True,47,Tests_passed,dbf5991e5695532e2e2785d52ade252ac90a581263b493e951ccc81bed099d07,True,Tests_passed,6e21f76599e647576e6c2001eb548dcd56b9a05fa26f60cd8c8422aeefcae914,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_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,ec0689371e1b2189a2ad8ba6488c4bc303e295fd6ef461efe2b8c10755bddee9,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,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_passed,3e81d77c2cdb116c1269555126bed5c9c60cc85cb2b248814d128abf9ec288cb,Tests_failed,ec0689371e1b2189a2ad8ba6488c4bc303e295fd6ef461efe2b8c10755bddee9,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,0.03161025047302246,0.0363924503326416,0.03439044952392578,0.03989219665527344,0.05126047134399414,0.03599882125854492,0.04647684097290039,0.1410083770751953,0.15465140342712402,1.2532639503479004,1.1540651321411133,0.06693387031555176,0.09843873977661133,0.04824519157409668,0.11335945129394531,0.1033928394317627 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +120,refs/remotes/origin/pull/221,ed1f9d4dca07aefc6c353bd84552f7cc041a63aa,92c0b43b2a391f52f633ebe2eff4c288988b8cfa,f9701f96519acb1bb7e45f3b8cbabdb81f08ed9c,,True,True,True,47,185,1102,3,True,47,Tests_passed,dbf5991e5695532e2e2785d52ade252ac90a581263b493e951ccc81bed099d07,True,Tests_passed,6e21f76599e647576e6c2001eb548dcd56b9a05fa26f60cd8c8422aeefcae914,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_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,ec0689371e1b2189a2ad8ba6488c4bc303e295fd6ef461efe2b8c10755bddee9,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,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_passed,3e81d77c2cdb116c1269555126bed5c9c60cc85cb2b248814d128abf9ec288cb,Tests_failed,ec0689371e1b2189a2ad8ba6488c4bc303e295fd6ef461efe2b8c10755bddee9,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,0.03161025047302246,0.0363924503326416,0.03439044952392578,0.03989219665527344,0.05126047134399414,0.03599882125854492,0.04647684097290039,0.1410083770751953,0.15465140342712402,1.2532639503479004,1.1540651321411133,0.06693387031555176,0.09843873977661133,0.04824519157409668,0.11335945129394531,0.1033928394317627,0.0906381607055664,0.11480522155761719,0.08885478973388672,0.09320950508117676,0.11835789680480957,0.09106850624084473,0.11607933044433594,0.15799975395202637,0.1849515438079834,1.474848985671997,1.2269325256347656,0.08875298500061035,0.11146020889282227,0.10995316505432129,0.09165573120117188,0.11160826683044434 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 4670bf46b6..0fc698b63c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,True,True,Tests_passed,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,True,56,144,583,2,True,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,True,56,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_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,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_failed,ecf649a06c5bafc9522a2b9b03d3780c2b466479c33a6829eaaf04e9fd3af719,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,0.042525529861450195,0.05101633071899414,0.06299996376037598,0.025599002838134766,0.03650164604187012,0.04703545570373535,0.04755830764770508,0.16946744918823242,0.11815142631530762,1.123809576034546,1.1631641387939453,0.042821407318115234,0.07060456275939941,0.043038129806518555,0.07047390937805176,0.06878471374511719 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,True,True,Tests_passed,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,True,56,144,583,2,True,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,True,56,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_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,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_failed,ecf649a06c5bafc9522a2b9b03d3780c2b466479c33a6829eaaf04e9fd3af719,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,0.042525529861450195,0.05101633071899414,0.06299996376037598,0.025599002838134766,0.03650164604187012,0.04703545570373535,0.04755830764770508,0.16946744918823242,0.11815142631530762,1.123809576034546,1.1631641387939453,0.042821407318115234,0.07060456275939941,0.043038129806518555,0.07047390937805176,0.06878471374511719,0.06994795799255371,0.07103109359741211,0.07245683670043945,0.07303142547607422,0.07038450241088867,0.07270407676696777,0.07199478149414062,0.10392212867736816,0.10208916664123535,1.2443225383758545,1.2872366905212402,0.06814146041870117,0.06836891174316406,0.07037639617919922,0.06988143920898438,0.07139134407043457 diff --git a/results/combined/merges_timed/awslabs/dynamodb-geo.csv b/results/combined/merges_timed/awslabs/dynamodb-geo.csv index 0c39ba7c8c..4140a8923b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,True,True,Tests_passed,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,True,5,13,95,2,True,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,True,5,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,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,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,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,80d2a7fce0beab0f093ef1471c2c8c0b3f396f1f06dedfa11ffa39a53d3714a0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,0.09301209449768066,0.0930325984954834,0.05215287208557129,0.15471959114074707,0.13864517211914062,0.13538146018981934,0.11452960968017578,0.17320847511291504,0.11213922500610352,0.8321640491485596,0.3857078552246094,0.029835939407348633,0.2389523983001709,0.03037858009338379,0.2355029582977295,0.2514524459838867 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,True,True,Tests_passed,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,True,5,13,95,2,True,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,True,5,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,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,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,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,80d2a7fce0beab0f093ef1471c2c8c0b3f396f1f06dedfa11ffa39a53d3714a0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,0.09301209449768066,0.0930325984954834,0.05215287208557129,0.15471959114074707,0.13864517211914062,0.13538146018981934,0.11452960968017578,0.17320847511291504,0.11213922500610352,0.8321640491485596,0.3857078552246094,0.029835939407348633,0.2389523983001709,0.03037858009338379,0.2355029582977295,0.2514524459838867,0.21930289268493652,0.24005937576293945,0.07837724685668945,0.28885483741760254,0.2913174629211426,0.26755428314208984,0.05487251281738281,0.3590993881225586,0.3122134208679199,0.9052462577819824,0.6263561248779297,0.23280096054077148,0.053017616271972656,0.2391376495361328,0.22205758094787598,0.14391493797302246 diff --git a/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv b/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv index d9d2aef77a..19bc387956 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,True,True,Tests_passed,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,True,7,17,155,3,True,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,True,7,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,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,42a71b233609dfb4d1d97e03dc2c1d04daad7335ad97e37985f7ec5a5a58f4ac,Tests_passed,87d28f843b16fbb56ce8eea545ff89d6822e4a2fe0e6154d0e17c5dc25f5f154,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,0.043430328369140625,0.04649186134338379,0.0443730354309082,0.016335248947143555,0.04446673393249512,0.04247570037841797,0.041356563568115234,0.2168745994567871,0.1710834503173828,0.7936110496520996,0.26379919052124023,0.030257701873779297,0.07522058486938477,0.028754711151123047,0.0733644962310791,0.07359671592712402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,True,True,Tests_passed,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,True,7,17,155,3,True,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,True,7,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,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,42a71b233609dfb4d1d97e03dc2c1d04daad7335ad97e37985f7ec5a5a58f4ac,Tests_passed,87d28f843b16fbb56ce8eea545ff89d6822e4a2fe0e6154d0e17c5dc25f5f154,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,b20116ef21c4688be87d12e0c62080e1352f60269006a0c0e08b0ae56c2d589f,Tests_passed,06b61015d7c10398bebb1a09098f6c01858866428af04316a9a29a365440c760,0.043430328369140625,0.04649186134338379,0.0443730354309082,0.016335248947143555,0.04446673393249512,0.04247570037841797,0.041356563568115234,0.2168745994567871,0.1710834503173828,0.7936110496520996,0.26379919052124023,0.030257701873779297,0.07522058486938477,0.028754711151123047,0.0733644962310791,0.07359671592712402,0.07468295097351074,0.07380390167236328,0.07514715194702148,0.07620668411254883,0.0755460262298584,0.07404971122741699,0.07489395141601562,0.1244654655456543,0.13135147094726562,0.9542007446289062,0.31034111976623535,0.07451272010803223,0.07395124435424805,0.0740664005279541,0.07584667205810547,0.07494616508483887 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 30eb5e2bc1..7de07631a4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -107,refs/remotes/origin/pull/189,7ba3f410c7ea8203968eeb2c99ab62442eca40a6,58a2d8745bbe51f24c83ed6e1366f803938e6aec,6cbac35775566870f20a40e3bcec515b7abd24e9,,True,True,True,19,94,1316,4,True,19,Tests_passed,752b6a018987f3867236868724a405de7294f1d5368214a6d168ebb97ccd008f,True,Tests_passed,affbc3e449c2e8faaba9bcdd5ef5e150b19db4b16dcfc1ef64435f60fd9926b1,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,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,e8ad2e5031b24add152c3ae72bd7a1a0f6f6f0c0e7242789a8555ab6a222acc0,Merge_failed,d4d637d1d79f32b1d9d62c67e64dca62432377aeb8c46266d144556d5276cf8e,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,4832196425266b9d1475a9b5d04bc522a0804981614fab4026f20b4263fa7540,Merge_failed,d7247dbd66ebf34d029ce151598eefdbe0a6f9107d8ff6f4510217e1773a1f2e,Merge_failed,0c5de449ce68c802c2039b54272ae2ece7b3bd5984a5f4a0ef65f3dfd26cea76,Tests_failed,8f2d049295fd4162666339103dfd19d76d8506ac89ef465ad97eb3c8af232494,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,0.03459620475769043,0.04503369331359863,0.038634300231933594,0.0225679874420166,0.053168296813964844,0.05708575248718262,0.054231882095336914,0.3261525630950928,0.2500474452972412,2.9412715435028076,0.6320598125457764,0.0671229362487793,0.09251594543457031,0.06308865547180176,0.09037232398986816,0.09241414070129395 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +107,refs/remotes/origin/pull/189,7ba3f410c7ea8203968eeb2c99ab62442eca40a6,58a2d8745bbe51f24c83ed6e1366f803938e6aec,6cbac35775566870f20a40e3bcec515b7abd24e9,,True,True,True,19,94,1316,4,True,19,Tests_passed,752b6a018987f3867236868724a405de7294f1d5368214a6d168ebb97ccd008f,True,Tests_passed,affbc3e449c2e8faaba9bcdd5ef5e150b19db4b16dcfc1ef64435f60fd9926b1,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,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,e8ad2e5031b24add152c3ae72bd7a1a0f6f6f0c0e7242789a8555ab6a222acc0,Merge_failed,d4d637d1d79f32b1d9d62c67e64dca62432377aeb8c46266d144556d5276cf8e,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,4832196425266b9d1475a9b5d04bc522a0804981614fab4026f20b4263fa7540,Merge_failed,d7247dbd66ebf34d029ce151598eefdbe0a6f9107d8ff6f4510217e1773a1f2e,Merge_failed,0c5de449ce68c802c2039b54272ae2ece7b3bd5984a5f4a0ef65f3dfd26cea76,Tests_failed,8f2d049295fd4162666339103dfd19d76d8506ac89ef465ad97eb3c8af232494,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,Merge_failed,d0e62080b1203d4c2abf3cd203b60c07b27412e2c43372542387fda6ec45783a,0.03459620475769043,0.04503369331359863,0.038634300231933594,0.0225679874420166,0.053168296813964844,0.05708575248718262,0.054231882095336914,0.3261525630950928,0.2500474452972412,2.9412715435028076,0.6320598125457764,0.0671229362487793,0.09251594543457031,0.06308865547180176,0.09037232398986816,0.09241414070129395,0.09301304817199707,0.09616780281066895,0.09566998481750488,0.09529829025268555,0.09253478050231934,0.09370708465576172,0.09288573265075684,0.1645338535308838,0.19856953620910645,3.3874080181121826,0.7860870361328125,0.09068703651428223,0.09307169914245605,0.09210848808288574,0.0944976806640625,0.09169268608093262 diff --git a/results/combined/merges_timed/b/kafka-websocket.csv b/results/combined/merges_timed/b/kafka-websocket.csv index 51f33f0a9b..8072249735 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,True,15,32,400,2,True,15,Tests_passed,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,True,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,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,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,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,e8e6195230cf38242aab053d1c620ccff603b35fb72a2e9abfae96b26ec69f0a,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,0.008585691452026367,0.008965492248535156,0.009319782257080078,0.0149993896484375,0.00873422622680664,0.008953094482421875,0.00917959213256836,0.038961172103881836,0.11918807029724121,1.3069379329681396,0.464918851852417,0.03067946434020996,0.05496788024902344,0.030343055725097656,0.05418062210083008,0.05394339561462402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,True,15,32,400,2,True,15,Tests_passed,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,True,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,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,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,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,e8e6195230cf38242aab053d1c620ccff603b35fb72a2e9abfae96b26ec69f0a,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,0.008585691452026367,0.008965492248535156,0.009319782257080078,0.0149993896484375,0.00873422622680664,0.008953094482421875,0.00917959213256836,0.038961172103881836,0.11918807029724121,1.3069379329681396,0.464918851852417,0.03067946434020996,0.05496788024902344,0.030343055725097656,0.05418062210083008,0.05394339561462402,0.05387091636657715,0.054514408111572266,0.05554914474487305,0.05478262901306152,0.05423998832702637,0.05508112907409668,0.054720401763916016,0.08932948112487793,0.11176180839538574,1.5370750427246094,0.5398423671722412,0.055405378341674805,0.054180145263671875,0.05439615249633789,0.0539553165435791,0.05256462097167969 diff --git a/results/combined/merges_timed/barend/java-iban.csv b/results/combined/merges_timed/barend/java-iban.csv index c06f226862..00f57f8483 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,False,True,5,30,168,4,True,5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,True,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,True,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,69dd05809a336ccfa9267c41766e292fcb17c00af23cfca504726a01a0350fb5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,Merge_failed,8f6f5588930737f6e9270cd660197a3c59bf25f88d3685354994313c21986d5a,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,36e16d029a6825d4e9cce7f2864a42f6507d162a68c84742f826dd8a83e8e5bc,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Tests_failed,3f7d23125ba1076bf4fde17e81a2bb363d9f09806e299b689528f9f939d91fe6,Tests_failed,b6b118f94113a7f24492c47860dff284cf9b055f7443e615fb8a1ce376ab195d,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,0.00970315933227539,0.009860515594482422,0.009824514389038086,0.014562606811523438,0.009905815124511719,0.009815454483032227,0.009597301483154297,0.06370282173156738,0.1849057674407959,2.5425896644592285,0.35222363471984863,0.042536020278930664,0.08238458633422852,0.04170823097229004,0.08072328567504883,0.08306336402893066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,False,True,5,30,168,4,True,5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,True,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,True,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,69dd05809a336ccfa9267c41766e292fcb17c00af23cfca504726a01a0350fb5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,Merge_failed,8f6f5588930737f6e9270cd660197a3c59bf25f88d3685354994313c21986d5a,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,36e16d029a6825d4e9cce7f2864a42f6507d162a68c84742f826dd8a83e8e5bc,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Tests_failed,3f7d23125ba1076bf4fde17e81a2bb363d9f09806e299b689528f9f939d91fe6,Tests_failed,b6b118f94113a7f24492c47860dff284cf9b055f7443e615fb8a1ce376ab195d,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,0.00970315933227539,0.009860515594482422,0.009824514389038086,0.014562606811523438,0.009905815124511719,0.009815454483032227,0.009597301483154297,0.06370282173156738,0.1849057674407959,2.5425896644592285,0.35222363471984863,0.042536020278930664,0.08238458633422852,0.04170823097229004,0.08072328567504883,0.08306336402893066,0.07970428466796875,0.08008503913879395,0.08009529113769531,0.08005857467651367,0.07952356338500977,0.07915878295898438,0.07922863960266113,0.1438591480255127,0.17214441299438477,2.402604818344116,0.4355342388153076,0.07984519004821777,0.07880139350891113,0.08050060272216797,0.07848978042602539,0.07770061492919922 diff --git a/results/combined/merges_timed/basho/riak-java-client.csv b/results/combined/merges_timed/basho/riak-java-client.csv index ec39f5540b..0fa2030546 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,True,16,61,252,2,True,16,Tests_passed,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,True,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,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,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,0.011985540390014648,0.011957406997680664,0.013340473175048828,0.020198822021484375,0.013278961181640625,0.013298749923706055,0.01287078857421875,0.039090633392333984,0.06747055053710938,0.01540827751159668,0.45018959045410156,0.039707183837890625,0.06538844108581543,0.038575172424316406,0.06641459465026855,0.06680560111999512 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,True,16,61,252,2,True,16,Tests_passed,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,True,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,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,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,Tests_passed,e303a95f747687871a236dda3cd08e4a5f3580211b1eb49fc3e1622509f4b5f2,0.011985540390014648,0.011957406997680664,0.013340473175048828,0.020198822021484375,0.013278961181640625,0.013298749923706055,0.01287078857421875,0.039090633392333984,0.06747055053710938,0.01540827751159668,0.45018959045410156,0.039707183837890625,0.06538844108581543,0.038575172424316406,0.06641459465026855,0.06680560111999512,0.06539654731750488,0.06389451026916504,0.06469225883483887,0.06544756889343262,0.06502628326416016,0.06570267677307129,0.0637660026550293,0.09856152534484863,0.09342169761657715,0.07758879661560059,0.47826290130615234,0.06350970268249512,0.06518912315368652,0.06444430351257324,0.06574225425720215,0.06556224822998047 diff --git a/results/combined/merges_timed/bastillion-io/bastillion.csv b/results/combined/merges_timed/bastillion-io/bastillion.csv index 82f4291c2f..fd13b057a3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,True,7,32,113,2,True,7,Tests_passed,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,True,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,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,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,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,87d41024233a1d90b32abc4bf4dcdd4a4bee07547948ed695b49553d80808883,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.017215490341186523,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.12875866889953613,1.1734318733215332,0.41932129859924316,0.060593605041503906,0.08823919296264648,0.058957815170288086,0.0858161449432373,0.08637738227844238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,True,7,32,113,2,True,7,Tests_passed,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,True,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,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,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,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,87d41024233a1d90b32abc4bf4dcdd4a4bee07547948ed695b49553d80808883,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.017215490341186523,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.12875866889953613,1.1734318733215332,0.41932129859924316,0.060593605041503906,0.08823919296264648,0.058957815170288086,0.0858161449432373,0.08637738227844238,0.0817103385925293,0.08469676971435547,0.08736658096313477,0.08880448341369629,0.056946516036987305,0.08994054794311523,0.08600854873657227,0.09052491188049316,0.11996889114379883,1.1728572845458984,0.473818302154541,0.08096432685852051,0.07702517509460449,0.08356261253356934,0.057955026626586914,0.08241534233093262 diff --git a/results/combined/merges_timed/bazhenov/load-test-tool.csv b/results/combined/merges_timed/bazhenov/load-test-tool.csv index 1d7f495ef9..f9095b8646 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,False,Tests_passed,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,True,2,1,8.0,17,True,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,True,17,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,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,6c9090a15ab8ab03901b8866a99400f010fe358d7a6d8701ed1163f0c04153bc,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,0.038123130798339844,0.0391240119934082,0.03932833671569824,0.014200210571289062,0.036347389221191406,0.04111480712890625,0.04415750503540039,0.17374277114868164,0.1041419506072998,0.44814300537109375,0.3598761558532715,0.03976583480834961,0.04270815849304199,0.04029273986816406,0.04307246208190918,0.0417783260345459 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,False,Tests_passed,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,True,2,1,8.0,17,True,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,True,17,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,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,6c9090a15ab8ab03901b8866a99400f010fe358d7a6d8701ed1163f0c04153bc,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,0.038123130798339844,0.0391240119934082,0.03932833671569824,0.014200210571289062,0.036347389221191406,0.04111480712890625,0.04415750503540039,0.17374277114868164,0.1041419506072998,0.44814300537109375,0.3598761558532715,0.03976583480834961,0.04270815849304199,0.04029273986816406,0.04307246208190918,0.0417783260345459,0.04081273078918457,0.039629459381103516,0.040535688400268555,0.039728403091430664,0.03959178924560547,0.04107260704040527,0.04057145118713379,0.07106637954711914,0.07738971710205078,0.47437596321105957,0.39919400215148926,0.04114031791687012,0.04161787033081055,0.04061150550842285,0.04085040092468262,0.04055142402648926 diff --git a/results/combined/merges_timed/beastmachine/ggplot.csv b/results/combined/merges_timed/beastmachine/ggplot.csv index 01ff0d93e7..4fe533b735 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,True,6,15,188,2,True,6,Tests_passed,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,True,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,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,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,6d6e37c0a650ab99ba8d30a41fdac6ff10b29f8229c3dfda0fe797f8771b3ea5,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,0.03054642677307129,0.038384437561035156,0.04659891128540039,0.015123367309570312,0.03882455825805664,0.04100322723388672,0.032270193099975586,0.16979598999023438,0.10570454597473145,0.5409183502197266,0.3335423469543457,0.04288601875305176,0.04291176795959473,0.04282498359680176,0.0481266975402832,0.04403829574584961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,True,6,15,188,2,True,6,Tests_passed,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,True,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,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,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,6d6e37c0a650ab99ba8d30a41fdac6ff10b29f8229c3dfda0fe797f8771b3ea5,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,0.03054642677307129,0.038384437561035156,0.04659891128540039,0.015123367309570312,0.03882455825805664,0.04100322723388672,0.032270193099975586,0.16979598999023438,0.10570454597473145,0.5409183502197266,0.3335423469543457,0.04288601875305176,0.04291176795959473,0.04282498359680176,0.0481266975402832,0.04403829574584961,0.04815411567687988,0.044091224670410156,0.049387216567993164,0.04443788528442383,0.04947257041931152,0.0465846061706543,0.04761242866516113,0.08350276947021484,0.08269619941711426,0.5818471908569336,0.4047565460205078,0.048539161682128906,0.04985761642456055,0.04781842231750488,0.04863429069519043,0.043168067932128906 diff --git a/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv b/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv index acf19d582e..20da2abac3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,True,True,Tests_passed,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,True,3,4,13,2,True,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,True,3,True,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,74cb1006fcada0fd6e0b9c25db6a64cdb3e6c872db4702d872d14957b27195b7,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Tests_failed,6eea65c340c77581b6d0f2601b9366fb865977a724fd1fc381f449ebeeee1cca,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,25139ee63889714d658a89b47e600103d6147ac61127d9d1417631f046f45f78,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,c44623d1bfd6c03ffe35346f72081dcd9a6e19c43fc80667d61d542a15c27170,Tests_failed,6da82a059a05de82c944e0e4f80c3f82bc4ac5f60d7c6a50fd4e2ff91edf652f,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,0.030667781829833984,0.03727364540100098,0.03853106498718262,0.012338638305664062,0.03143477439880371,0.03269243240356445,0.03667092323303223,0.16221332550048828,0.10513496398925781,0.7702414989471436,0.2731759548187256,0.03830981254577637,0.03932595252990723,0.03816843032836914,0.040712594985961914,0.03977537155151367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,True,True,Tests_passed,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,True,3,4,13,2,True,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,True,3,True,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,74cb1006fcada0fd6e0b9c25db6a64cdb3e6c872db4702d872d14957b27195b7,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Tests_failed,6eea65c340c77581b6d0f2601b9366fb865977a724fd1fc381f449ebeeee1cca,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,25139ee63889714d658a89b47e600103d6147ac61127d9d1417631f046f45f78,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,c44623d1bfd6c03ffe35346f72081dcd9a6e19c43fc80667d61d542a15c27170,Tests_failed,6da82a059a05de82c944e0e4f80c3f82bc4ac5f60d7c6a50fd4e2ff91edf652f,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,0.030667781829833984,0.03727364540100098,0.03853106498718262,0.012338638305664062,0.03143477439880371,0.03269243240356445,0.03667092323303223,0.16221332550048828,0.10513496398925781,0.7702414989471436,0.2731759548187256,0.03830981254577637,0.03932595252990723,0.03816843032836914,0.040712594985961914,0.03977537155151367,0.04047679901123047,0.03993844985961914,0.04066634178161621,0.03922224044799805,0.04051542282104492,0.03966879844665527,0.039827585220336914,0.07080435752868652,0.07561802864074707,0.8547012805938721,0.33014583587646484,0.03980827331542969,0.04071402549743652,0.04035305976867676,0.040316104888916016,0.040518760681152344 diff --git a/results/combined/merges_timed/benas/easy-rules.csv b/results/combined/merges_timed/benas/easy-rules.csv index f21d287572..966ee667e1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,True,False,Tests_passed,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,True,4,6,13,3,True,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,True,4,True,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,61d60f93ef0900a0209a83f92009f89d46755fb0ff4e42e880f7d7bc20820d44,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,da0bb9e8b79ab0223e69023be2711cdd9e5bb22545b135b79796664b82d8cc38,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,0b1298faa801f00710f9c075e69cca894525f780cbf5329a23106b2e87a4d7e8,Tests_failed,2f883ca73b5e50c417403b1fa2f9befb7a528b11b0837ead0e4056282ac36c33,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,0.028174638748168945,0.029384136199951172,0.041097164154052734,0.020140409469604492,0.04118204116821289,0.04319357872009277,0.034900665283203125,0.2266981601715088,0.14893174171447754,1.179353952407837,0.29004621505737305,0.060695648193359375,0.055693864822387695,0.061252593994140625,0.060079336166381836,0.05548572540283203 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,True,False,Tests_passed,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,True,4,6,13,3,True,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,True,4,True,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,61d60f93ef0900a0209a83f92009f89d46755fb0ff4e42e880f7d7bc20820d44,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,da0bb9e8b79ab0223e69023be2711cdd9e5bb22545b135b79796664b82d8cc38,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,0b1298faa801f00710f9c075e69cca894525f780cbf5329a23106b2e87a4d7e8,Tests_failed,2f883ca73b5e50c417403b1fa2f9befb7a528b11b0837ead0e4056282ac36c33,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,0.028174638748168945,0.029384136199951172,0.041097164154052734,0.020140409469604492,0.04118204116821289,0.04319357872009277,0.034900665283203125,0.2266981601715088,0.14893174171447754,1.179353952407837,0.29004621505737305,0.060695648193359375,0.055693864822387695,0.061252593994140625,0.060079336166381836,0.05548572540283203,0.058263301849365234,0.05893278121948242,0.05853128433227539,0.05863022804260254,0.05203819274902344,0.05911087989807129,0.06005692481994629,0.0996394157409668,0.12244582176208496,1.2783279418945312,0.36580777168273926,0.06093144416809082,0.05182671546936035,0.058263301849365234,0.059119224548339844,0.058600425720214844 diff --git a/results/combined/merges_timed/benas/projector.csv b/results/combined/merges_timed/benas/projector.csv index 4e3ae92910..ab5b4427cf 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,True,True,Tests_passed,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,True,23,73,391,4,True,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,True,23,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,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,63164e6e6f50487302575afc7b68b5dd59582a0b0fa6a875a84774bee2a8e2fb,Tests_failed,a1ac7cd5aa2ae0677192df5369f46a8888bcb18f185319c4a61c1c40aaf423fb,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,0.009256601333618164,0.008911848068237305,0.009033203125,0.015157938003540039,0.009224653244018555,0.009671926498413086,0.009168624877929688,0.05839204788208008,0.17456793785095215,1.5798366069793701,0.44384264945983887,0.04970431327819824,0.09110879898071289,0.042159080505371094,0.09180831909179688,0.0902860164642334 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,True,True,Tests_passed,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,True,23,73,391,4,True,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,True,23,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,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,63164e6e6f50487302575afc7b68b5dd59582a0b0fa6a875a84774bee2a8e2fb,Tests_failed,a1ac7cd5aa2ae0677192df5369f46a8888bcb18f185319c4a61c1c40aaf423fb,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,0.009256601333618164,0.008911848068237305,0.009033203125,0.015157938003540039,0.009224653244018555,0.009671926498413086,0.009168624877929688,0.05839204788208008,0.17456793785095215,1.5798366069793701,0.44384264945983887,0.04970431327819824,0.09110879898071289,0.042159080505371094,0.09180831909179688,0.0902860164642334,0.09173941612243652,0.0933234691619873,0.0952308177947998,0.09264230728149414,0.09329652786254883,0.09432625770568848,0.09131312370300293,0.15667057037353516,0.1852877140045166,1.8669273853302002,0.585979700088501,0.09402632713317871,0.09387826919555664,0.09407711029052734,0.09107208251953125,0.09288692474365234 diff --git a/results/combined/merges_timed/benoker/dockingframes.csv b/results/combined/merges_timed/benoker/dockingframes.csv index 6c5710a36e..ff4c7d87ed 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -85,refs/heads/master,c3dfb4ebbfeb49d09b88c8aefaa07183eb0fa06f,a290c6b19c9e7efaa8a780d9c97e2d6173b69b09,de608ff664a7df506839703b09a98b6f21d41491,,True,True,True,20,240,1951.0,3,True,20,Tests_passed,1bec92ba3e6acc88f87f589e9ba1b941f49efbcf9023abcafc424da963573e79,True,Tests_passed,9143dea5299555abf5e5e88b9862399b8bd701f9def2b8782fc3b4fa6aaee830,True,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1f878068cbb33d4cfb4f0ebbe553004ec67eb7f88ce304fc08b87e7a9ca3bd0a,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_timedout,,Merge_failed,13bc0a3430539c822c51f0aeab3041450754c8d9861858ccd5e8cab2033960d2,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,ae95b45d943533df2566d6cb16a45ca0830ca09c8d97fac66e5cef3182f87a87,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,d5c806d66e58ccdbed5b4df399fefc4313c4a21dc90084df008b2f4764ff952d,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,bc2e7a2778d4a5ad01efd5400a9327b1f12d031c90660c7f0c42cfe86d252111,Merge_timedout,,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,0.016859054565429688,0.0172269344329834,0.018302202224731445,0.028697490692138672,0.018211841583251953,0.017676591873168945,0.018522262573242188,0.07827520370483398,0.13207769393920898,3.0810937881469727,-1.0,0.06972241401672363,0.06857991218566895,0.0671529769897461,0.06933784484863281,0.09486079216003418 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +85,refs/heads/master,c3dfb4ebbfeb49d09b88c8aefaa07183eb0fa06f,a290c6b19c9e7efaa8a780d9c97e2d6173b69b09,de608ff664a7df506839703b09a98b6f21d41491,,True,True,True,20,240,1951.0,3,True,20,Tests_passed,1bec92ba3e6acc88f87f589e9ba1b941f49efbcf9023abcafc424da963573e79,True,Tests_passed,9143dea5299555abf5e5e88b9862399b8bd701f9def2b8782fc3b4fa6aaee830,True,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1f878068cbb33d4cfb4f0ebbe553004ec67eb7f88ce304fc08b87e7a9ca3bd0a,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_timedout,,Merge_failed,13bc0a3430539c822c51f0aeab3041450754c8d9861858ccd5e8cab2033960d2,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,ae95b45d943533df2566d6cb16a45ca0830ca09c8d97fac66e5cef3182f87a87,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,d5c806d66e58ccdbed5b4df399fefc4313c4a21dc90084df008b2f4764ff952d,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,bc2e7a2778d4a5ad01efd5400a9327b1f12d031c90660c7f0c42cfe86d252111,Merge_timedout,,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,11e4ae2d7de8b496eadccf6375b60f8da1478223d5a8662ebcaea3b739cb76ec,0.016859054565429688,0.0172269344329834,0.018302202224731445,0.028697490692138672,0.018211841583251953,0.017676591873168945,0.018522262573242188,0.07827520370483398,0.13207769393920898,3.0810937881469727,-1.0,0.06972241401672363,0.06857991218566895,0.0671529769897461,0.06933784484863281,0.09486079216003418,0.06672501564025879,0.0849754810333252,0.0693812370300293,0.08875918388366699,0.06793403625488281,0.06725597381591797,0.06758999824523926,0.12454819679260254,0.1274867057800293,3.2531347274780273,-1.0,0.066741943359375,0.06758666038513184,0.06724166870117188,0.06543493270874023,0.0851585865020752 diff --git a/results/combined/merges_timed/bguerout/jongo.csv b/results/combined/merges_timed/bguerout/jongo.csv index 5d8abb84b5..bac6e952bc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,True,True,True,39,99,1921,7,True,42,Tests_passed,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,True,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,True,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,8e76cb6a448635dd1fe09fe138a948f98b94c6d7d347f64bfe9fb22e4cf666ee,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,a2f1b57302a8fafa4d24feb92a0da7da1c862d59f2d7889510b0cd8d3cc78df3,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,7f41d95b5228bef2087e6b316a2e8c5f04f83338bb9901bee069678889d0f9c4,Tests_failed,c52799d4c16948be65f73fc5417b82a766927b852f3cc293c10cbc610b81dd38,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,0.055085182189941406,0.05562114715576172,0.04331183433532715,0.02458024024963379,0.05116462707519531,0.05127429962158203,0.04306507110595703,0.30126404762268066,0.20873570442199707,2.37990665435791,0.47820520401000977,0.06473946571350098,0.07988715171813965,0.06540632247924805,0.08794879913330078,0.08622527122497559 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,True,True,True,39,99,1921,7,True,42,Tests_passed,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,True,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,True,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,8e76cb6a448635dd1fe09fe138a948f98b94c6d7d347f64bfe9fb22e4cf666ee,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,a2f1b57302a8fafa4d24feb92a0da7da1c862d59f2d7889510b0cd8d3cc78df3,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,7f41d95b5228bef2087e6b316a2e8c5f04f83338bb9901bee069678889d0f9c4,Tests_failed,c52799d4c16948be65f73fc5417b82a766927b852f3cc293c10cbc610b81dd38,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,0.055085182189941406,0.05562114715576172,0.04331183433532715,0.02458024024963379,0.05116462707519531,0.05127429962158203,0.04306507110595703,0.30126404762268066,0.20873570442199707,2.37990665435791,0.47820520401000977,0.06473946571350098,0.07988715171813965,0.06540632247924805,0.08794879913330078,0.08622527122497559,0.08379769325256348,0.08145880699157715,0.07611584663391113,0.08391356468200684,0.0851290225982666,0.08121752738952637,0.0830388069152832,0.14939355850219727,0.16125869750976562,2.333627462387085,0.5676467418670654,0.07652735710144043,0.08520984649658203,0.08291459083557129,0.07687783241271973,0.08210492134094238 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 7914d2c45e..56f83e1cc1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,True,True,Tests_passed,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,True,2,3,23,2,True,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,True,2,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,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,92ed591679182a786174e1a1622afa98852e2f19e17138386a03f189912fdb03,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.013308286666870117,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.11150431632995605,1.436072587966919,0.3807549476623535,0.04039454460144043,0.04279923439025879,0.0389714241027832,0.04207348823547363,0.0430300235748291 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,True,True,Tests_passed,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,True,2,3,23,2,True,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,True,2,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,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,92ed591679182a786174e1a1622afa98852e2f19e17138386a03f189912fdb03,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.013308286666870117,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.11150431632995605,1.436072587966919,0.3807549476623535,0.04039454460144043,0.04279923439025879,0.0389714241027832,0.04207348823547363,0.0430300235748291,0.039397239685058594,0.04059410095214844,0.03968477249145508,0.04017496109008789,0.0394744873046875,0.040247201919555664,0.0403289794921875,0.06902122497558594,0.07970046997070312,1.3908696174621582,0.42812108993530273,0.040926218032836914,0.04002666473388672,0.03939938545227051,0.040284156799316406,0.04053235054016113 diff --git a/results/combined/merges_timed/bitletorg/weupnp.csv b/results/combined/merges_timed/bitletorg/weupnp.csv index 5c4a22655d..7ae65ee2b3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,False,True,2,5,14,2,True,2,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,True,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,True,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,abd4e77e256c2ae47df2d738c7926f45886eb1d51543573a414e3f3156cde993,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Tests_failed,28b55b08566201dd36e78904b866d12057c8ce64f5d5a064b37c1c9325f22d49,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,3b4e64b320d431b5a2fe87c1fe29ff931f2f87d251169119e7a9008099649b70,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,cb0b7e85c6f21259b6ed889ab9a9dbbe58cf3d7f6c4d101a9f85a412de0fd211,Tests_failed,0150238bc3d610a6adb97899ec7e29e74fbbbfdc4620857140f8cdfe5649e970,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,0.0402216911315918,0.043372154235839844,0.04049539566040039,0.014803409576416016,0.03528904914855957,0.03667640686035156,0.03760385513305664,0.055582284927368164,0.11000323295593262,0.781761646270752,0.28243350982666016,0.03990793228149414,0.041562557220458984,0.03861880302429199,0.04171299934387207,0.05319070816040039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,False,True,2,5,14,2,True,2,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,True,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,True,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,abd4e77e256c2ae47df2d738c7926f45886eb1d51543573a414e3f3156cde993,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Tests_failed,28b55b08566201dd36e78904b866d12057c8ce64f5d5a064b37c1c9325f22d49,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,3b4e64b320d431b5a2fe87c1fe29ff931f2f87d251169119e7a9008099649b70,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,cb0b7e85c6f21259b6ed889ab9a9dbbe58cf3d7f6c4d101a9f85a412de0fd211,Tests_failed,0150238bc3d610a6adb97899ec7e29e74fbbbfdc4620857140f8cdfe5649e970,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,0.0402216911315918,0.043372154235839844,0.04049539566040039,0.014803409576416016,0.03528904914855957,0.03667640686035156,0.03760385513305664,0.055582284927368164,0.11000323295593262,0.781761646270752,0.28243350982666016,0.03990793228149414,0.041562557220458984,0.03861880302429199,0.04171299934387207,0.05319070816040039,0.040096282958984375,0.05131340026855469,0.03966975212097168,0.04912829399108887,0.039900779724121094,0.03936910629272461,0.04025602340698242,0.0710451602935791,0.07200479507446289,0.8137733936309814,0.34685397148132324,0.041196346282958984,0.03979349136352539,0.03991985321044922,0.03944039344787598,0.050264835357666016 diff --git a/results/combined/merges_timed/bitzeche/zencoder-java.csv b/results/combined/merges_timed/bitzeche/zencoder-java.csv index 632850b348..55afdf0d59 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,True,True,Tests_passed,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,True,7,29,147,2,True,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,True,7,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,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,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,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,9a56b8f210646c10e0cfd75ab704518325df6fd9d7195b8cb3e945dcde1293f5,Tests_failed,d0054b0bb1cdda8d5189ec47e435bc31f52980b34b8a4aafc89dac0d5a6fde4c,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,0.04459547996520996,0.047368526458740234,0.04953765869140625,0.015948772430419922,0.04794049263000488,0.043209075927734375,0.037962913513183594,0.16820240020751953,0.11035466194152832,1.056281566619873,0.372983455657959,0.031253814697265625,0.057317256927490234,0.03171658515930176,0.05714917182922363,0.05733489990234375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,True,True,Tests_passed,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,True,7,29,147,2,True,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,True,7,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,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,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,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,9a56b8f210646c10e0cfd75ab704518325df6fd9d7195b8cb3e945dcde1293f5,Tests_failed,d0054b0bb1cdda8d5189ec47e435bc31f52980b34b8a4aafc89dac0d5a6fde4c,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,0.04459547996520996,0.047368526458740234,0.04953765869140625,0.015948772430419922,0.04794049263000488,0.043209075927734375,0.037962913513183594,0.16820240020751953,0.11035466194152832,1.056281566619873,0.372983455657959,0.031253814697265625,0.057317256927490234,0.03171658515930176,0.05714917182922363,0.05733489990234375,0.052596092224121094,0.05505537986755371,0.05493617057800293,0.056296586990356445,0.055684566497802734,0.05578255653381348,0.05472135543823242,0.0875253677368164,0.084136962890625,1.077791452407837,0.41920924186706543,0.056471824645996094,0.05650019645690918,0.05655956268310547,0.05569648742675781,0.05619001388549805 diff --git a/results/combined/merges_timed/bjornharrtell/jts2geojson.csv b/results/combined/merges_timed/bjornharrtell/jts2geojson.csv index fa08623df8..5e373f349e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,True,14,20,153,3,True,14,Tests_passed,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,True,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,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,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,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,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,5512ef8171feee15ddb9185152fb6140c1597a917de50d76138bffbc3804a62b,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,0.04346346855163574,0.04460644721984863,0.042308807373046875,0.014672279357910156,0.04329204559326172,0.044895172119140625,0.03903460502624512,0.22295856475830078,0.16607904434204102,0.6618447303771973,0.296708345413208,0.030327320098876953,0.06857919692993164,0.029684782028198242,0.0697324275970459,0.0699162483215332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,True,14,20,153,3,True,14,Tests_passed,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,True,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,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,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,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,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,5512ef8171feee15ddb9185152fb6140c1597a917de50d76138bffbc3804a62b,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,0.04346346855163574,0.04460644721984863,0.042308807373046875,0.014672279357910156,0.04329204559326172,0.044895172119140625,0.03903460502624512,0.22295856475830078,0.16607904434204102,0.6618447303771973,0.296708345413208,0.030327320098876953,0.06857919692993164,0.029684782028198242,0.0697324275970459,0.0699162483215332,0.06622982025146484,0.06669878959655762,0.06669902801513672,0.06595635414123535,0.06719136238098145,0.06531119346618652,0.06685352325439453,0.11359858512878418,0.11921262741088867,0.7104513645172119,0.31780290603637695,0.06841588020324707,0.06737208366394043,0.06823325157165527,0.0679163932800293,0.06759190559387207 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 982ebd3d72..9b477aa595 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,True,11,37,332,2,True,11,Tests_passed,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,True,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,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,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,b79d392aa7fbc05ad33ee71c7269da2e06d38f8b9a73cb333a07bf4af79bc53f,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,c60e3c77a89f196a2b55a50363b57bb20695343cc6fe72619548219f9b17442c,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,0.037313222885131836,0.03557729721069336,0.039875030517578125,0.013826847076416016,0.044836997985839844,0.04068183898925781,0.03649425506591797,0.1635890007019043,0.09402608871459961,0.6908097267150879,0.3778269290924072,0.040749549865722656,0.04268026351928711,0.04072403907775879,0.042899131774902344,0.04236245155334473 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,True,11,37,332,2,True,11,Tests_passed,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,True,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,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,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,b79d392aa7fbc05ad33ee71c7269da2e06d38f8b9a73cb333a07bf4af79bc53f,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,c60e3c77a89f196a2b55a50363b57bb20695343cc6fe72619548219f9b17442c,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,0.037313222885131836,0.03557729721069336,0.039875030517578125,0.013826847076416016,0.044836997985839844,0.04068183898925781,0.03649425506591797,0.1635890007019043,0.09402608871459961,0.6908097267150879,0.3778269290924072,0.040749549865722656,0.04268026351928711,0.04072403907775879,0.042899131774902344,0.04236245155334473,0.04290008544921875,0.04267096519470215,0.04251527786254883,0.04311633110046387,0.04183816909790039,0.04195261001586914,0.042072296142578125,0.07529211044311523,0.09328460693359375,0.8417885303497314,0.4631814956665039,0.04210519790649414,0.042794227600097656,0.042714595794677734,0.042311906814575195,0.04288339614868164 diff --git a/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv b/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv index b29e8b5ff6..a970e941f9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,True,True,Tests_passed,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,True,4,29,256,2,True,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,True,4,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,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,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,030f0eca6a5ef189344f3c8582563ee111dd9fcf1f284cf4c1e83c72fff57a90,Tests_failed,7ac79f6300d2d05b4d7f91d1233b182498d8fc5353f5131e2b1394b1443e8a66,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,0.04646754264831543,0.04988241195678711,0.04315638542175293,0.017735004425048828,0.05012798309326172,0.052347421646118164,0.043356895446777344,0.1651782989501953,0.12100028991699219,1.4561455249786377,0.36045002937316895,0.03280448913574219,0.0612943172454834,0.03341817855834961,0.06119966506958008,0.06260085105895996 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,True,True,Tests_passed,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,True,4,29,256,2,True,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,True,4,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,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,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,030f0eca6a5ef189344f3c8582563ee111dd9fcf1f284cf4c1e83c72fff57a90,Tests_failed,7ac79f6300d2d05b4d7f91d1233b182498d8fc5353f5131e2b1394b1443e8a66,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,0.04646754264831543,0.04988241195678711,0.04315638542175293,0.017735004425048828,0.05012798309326172,0.052347421646118164,0.043356895446777344,0.1651782989501953,0.12100028991699219,1.4561455249786377,0.36045002937316895,0.03280448913574219,0.0612943172454834,0.03341817855834961,0.06119966506958008,0.06260085105895996,0.06006884574890137,0.060323476791381836,0.06246185302734375,0.06508517265319824,0.06172585487365723,0.060278892517089844,0.061383962631225586,0.09500932693481445,0.0958094596862793,1.7475368976593018,0.40511226654052734,0.062032222747802734,0.06318473815917969,0.060053110122680664,0.06286334991455078,0.06230664253234863 diff --git a/results/combined/merges_timed/bobharner/componentworld.csv b/results/combined/merges_timed/bobharner/componentworld.csv index c6a3b577a2..725d73e7c8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,Tests_passed,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,True,30,17,350,3,True,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,True,30,True,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,c929b6baa3ee92bfd4fe6ea595ed7ae18aeaa1659183a216cda18e04102bc991,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,fbfa8c8a0255ada33893b5992de2470c47e9ea7c946bfef2a9f6c1679a4ba381,Merge_failed,37998b3d9e3cd5bbc37a39886aad8614175f1e327029e9dc00a0e1cc5622db80,Merge_failed,1f7af782d579e08589dba9f35bfefb3840913ec7b34639597bc8ccce731b9a9b,Merge_timedout,,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,0.08621048927307129,0.05714869499206543,0.11442780494689941,0.11969327926635742,0.09696197509765625,0.11411190032958984,0.11404156684875488,0.16920256614685059,0.19932937622070312,0.5063347816467285,-1.0,0.14228463172912598,0.14934134483337402,0.1423969268798828,0.14079666137695312,0.14240765571594238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,Tests_passed,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,True,30,17,350,3,True,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,True,30,True,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,c929b6baa3ee92bfd4fe6ea595ed7ae18aeaa1659183a216cda18e04102bc991,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,fbfa8c8a0255ada33893b5992de2470c47e9ea7c946bfef2a9f6c1679a4ba381,Merge_failed,37998b3d9e3cd5bbc37a39886aad8614175f1e327029e9dc00a0e1cc5622db80,Merge_failed,1f7af782d579e08589dba9f35bfefb3840913ec7b34639597bc8ccce731b9a9b,Merge_timedout,,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,Merge_failed,9692c5ba20e8e6bd6d64b3ce8d4c0b716415609e60d4ba6a3241dcb6224480f5,0.08621048927307129,0.05714869499206543,0.11442780494689941,0.11969327926635742,0.09696197509765625,0.11411190032958984,0.11404156684875488,0.16920256614685059,0.19932937622070312,0.5063347816467285,-1.0,0.14228463172912598,0.14934134483337402,0.1423969268798828,0.14079666137695312,0.14240765571594238,0.15496182441711426,0.15857505798339844,0.17908620834350586,0.17878484725952148,0.1748032569885254,0.17728948593139648,0.17494654655456543,0.23158049583435059,0.25058484077453613,0.6422896385192871,-1.0,0.16073060035705566,0.16207313537597656,0.1634047031402588,0.17666339874267578,0.1758425235748291 diff --git a/results/combined/merges_timed/boilit/ebm.csv b/results/combined/merges_timed/boilit/ebm.csv index cbf73c4f94..56f4949dad 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,True,23,92,859,4,True,23,Tests_passed,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,True,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,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,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,dae3c9b811676dda35bc4a8e12892232bb50adbbd9154271668b1bfb90aa9372,Tests_failed,f2e5bb5ce45d8e76d17551bb6658de16c7a04b7998ead2a5b1ee5bcf4c8533b5,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,0.03714561462402344,0.07161188125610352,0.10403823852539062,0.12179398536682129,0.03570437431335449,0.11525130271911621,0.10470890998840332,0.28221678733825684,0.21256780624389648,0.7728300094604492,0.5340878963470459,0.1624906063079834,0.2156820297241211,0.1833205223083496,0.16659307479858398,0.26844263076782227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,True,23,92,859,4,True,23,Tests_passed,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,True,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,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,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,dae3c9b811676dda35bc4a8e12892232bb50adbbd9154271668b1bfb90aa9372,Tests_failed,f2e5bb5ce45d8e76d17551bb6658de16c7a04b7998ead2a5b1ee5bcf4c8533b5,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,Tests_passed,6a7f78d2dadf1bff8de3f0c271311cc02000fcbcd664aae97a02cf40a1884c0a,0.03714561462402344,0.07161188125610352,0.10403823852539062,0.12179398536682129,0.03570437431335449,0.11525130271911621,0.10470890998840332,0.28221678733825684,0.21256780624389648,0.7728300094604492,0.5340878963470459,0.1624906063079834,0.2156820297241211,0.1833205223083496,0.16659307479858398,0.26844263076782227,0.18211627006530762,0.250978946685791,0.12105655670166016,0.29565882682800293,0.21717596054077148,0.2911207675933838,0.29207301139831543,0.3640940189361572,0.367692232131958,0.9320051670074463,0.6035490036010742,0.2600076198577881,0.1120460033416748,0.2720777988433838,0.11823511123657227,0.26224279403686523 diff --git a/results/combined/merges_timed/brettflan/worldborder.csv b/results/combined/merges_timed/brettflan/worldborder.csv index e3dd3b0e20..2076d34c43 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,False,True,8,41,148,2,True,8,Tests_passed,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,True,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,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,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,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,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,0ee0b214a8516be468a9017d3bc940ad4ddabc30d1dfc69d4a261f607b19d145,Tests_passed,39baa072121ea8d791bdb583c0221740783a300ee1d907e26aa9ea10fad94d2b,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,0.011594295501708984,0.011245965957641602,0.012764215469360352,0.019733190536499023,0.011964082717895508,0.012707710266113281,0.01266336441040039,0.03743743896484375,0.06677007675170898,1.0676310062408447,0.5465939044952393,0.0371556282043457,0.06402993202209473,0.037432193756103516,0.06338334083557129,0.06372809410095215 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,False,True,8,41,148,2,True,8,Tests_passed,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,True,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,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,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,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,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,0ee0b214a8516be468a9017d3bc940ad4ddabc30d1dfc69d4a261f607b19d145,Tests_passed,39baa072121ea8d791bdb583c0221740783a300ee1d907e26aa9ea10fad94d2b,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,0.011594295501708984,0.011245965957641602,0.012764215469360352,0.019733190536499023,0.011964082717895508,0.012707710266113281,0.01266336441040039,0.03743743896484375,0.06677007675170898,1.0676310062408447,0.5465939044952393,0.0371556282043457,0.06402993202209473,0.037432193756103516,0.06338334083557129,0.06372809410095215,0.0615687370300293,0.060624122619628906,0.06201457977294922,0.06167459487915039,0.06342482566833496,0.061078786849975586,0.06352615356445312,0.09353399276733398,0.0914151668548584,1.2124114036560059,0.606250524520874,0.062178850173950195,0.06341385841369629,0.060840606689453125,0.0585627555847168,0.06187081336975098 diff --git a/results/combined/merges_timed/brettwooldridge/hikarijson.csv b/results/combined/merges_timed/brettwooldridge/hikarijson.csv index ba28ee7c64..a1ca7a1ace 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,True,7,23,186,3,True,7,Tests_passed,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,True,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,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,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Tests_failed,9289d2a851a28f6ce2c2a41c9f3d5adbca19b0b15c37ae20f9070b14e2a46273,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,65d83bcaaea0b80bb469cdcf40e257679b625c34441da17c70078e10045c3b07,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,2744602c59d7b0a7798eafeed60f63184bd7db15a614208c8df7de6342ccdaf0,Tests_failed,06ed392f74efc2b623a0a349cbb6f572dd8b92c01de6e3d5e937bfb539c915e9,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,0.03260231018066406,0.02874016761779785,0.0374603271484375,0.047127485275268555,0.033489227294921875,0.03817892074584961,0.060811758041381836,0.22415494918823242,0.18512439727783203,1.437009334564209,0.4330110549926758,0.07633566856384277,0.0987548828125,0.07880234718322754,0.09647011756896973,0.0997323989868164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,True,7,23,186,3,True,7,Tests_passed,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,True,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,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,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Tests_failed,9289d2a851a28f6ce2c2a41c9f3d5adbca19b0b15c37ae20f9070b14e2a46273,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,65d83bcaaea0b80bb469cdcf40e257679b625c34441da17c70078e10045c3b07,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,2744602c59d7b0a7798eafeed60f63184bd7db15a614208c8df7de6342ccdaf0,Tests_failed,06ed392f74efc2b623a0a349cbb6f572dd8b92c01de6e3d5e937bfb539c915e9,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,0.03260231018066406,0.02874016761779785,0.0374603271484375,0.047127485275268555,0.033489227294921875,0.03817892074584961,0.060811758041381836,0.22415494918823242,0.18512439727783203,1.437009334564209,0.4330110549926758,0.07633566856384277,0.0987548828125,0.07880234718322754,0.09647011756896973,0.0997323989868164,0.10115909576416016,0.0981135368347168,0.10402631759643555,0.10775899887084961,0.10751700401306152,0.10571622848510742,0.10327267646789551,0.16398930549621582,0.19820094108581543,1.653733491897583,0.5696899890899658,0.10194587707519531,0.09984207153320312,0.10055017471313477,0.09887409210205078,0.09673452377319336 diff --git a/results/combined/merges_timed/brettwooldridge/nuprocess.csv b/results/combined/merges_timed/brettwooldridge/nuprocess.csv index eaa5c91462..9ac59ae398 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,True,True,Tests_passed,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,True,6,9,39,2,True,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,True,6,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,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,d31a6956f2908a1ab8d9aeee9f373f298d7b36ca8de44196e8b843591b3f2177,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,48ef2c62f775ef5fc47ac73ed5d8c770a3d917e04e1cfcfea52808e6c3e93bda,Tests_failed,4169ef374aab9c022fe9238d557d69ef7bfa5d3677de7fadff22d2f8ab375ff7,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,0.03422904014587402,0.04122519493103027,0.03450489044189453,0.01865863800048828,0.04033923149108887,0.03405570983886719,0.043050527572631836,0.16683006286621094,0.12568187713623047,0.5470924377441406,0.3884751796722412,0.043389320373535156,0.04620695114135742,0.0463261604309082,0.04574918746948242,0.04616880416870117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,True,True,Tests_passed,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,True,6,9,39,2,True,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,True,6,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,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,d31a6956f2908a1ab8d9aeee9f373f298d7b36ca8de44196e8b843591b3f2177,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,48ef2c62f775ef5fc47ac73ed5d8c770a3d917e04e1cfcfea52808e6c3e93bda,Tests_failed,4169ef374aab9c022fe9238d557d69ef7bfa5d3677de7fadff22d2f8ab375ff7,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,0.03422904014587402,0.04122519493103027,0.03450489044189453,0.01865863800048828,0.04033923149108887,0.03405570983886719,0.043050527572631836,0.16683006286621094,0.12568187713623047,0.5470924377441406,0.3884751796722412,0.043389320373535156,0.04620695114135742,0.0463261604309082,0.04574918746948242,0.04616880416870117,0.044374704360961914,0.0438535213470459,0.04562687873840332,0.04405379295349121,0.04503607749938965,0.04270482063293457,0.04559016227722168,0.07851409912109375,0.08372855186462402,0.593529462814331,0.4386749267578125,0.0437471866607666,0.04356718063354492,0.042714595794677734,0.04197359085083008,0.04326343536376953 diff --git a/results/combined/merges_timed/brettwooldridge/sansorm.csv b/results/combined/merges_timed/brettwooldridge/sansorm.csv index 715f32eb24..650f19fce8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,True,False,Tests_passed,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,True,4,15,81,2,True,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,True,4,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,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,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,df813c87c5ec0a6f7198a4592bbae57ad35e7f1e3743269d9fee7038cb8d5750,Tests_failed,5496fd2e3e9d35b907d36d63d69df93a9cee7a7cca739530f1354427bfaa756c,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,0.010223865509033203,0.04660344123840332,0.04442596435546875,0.014898061752319336,0.043305158615112305,0.04065394401550293,0.043709516525268555,0.15832209587097168,0.11688232421875,0.6519486904144287,0.37714195251464844,0.030454635620117188,0.05414247512817383,0.02985548973083496,0.054229021072387695,0.05568194389343262 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,True,False,Tests_passed,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,True,4,15,81,2,True,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,True,4,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,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,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,df813c87c5ec0a6f7198a4592bbae57ad35e7f1e3743269d9fee7038cb8d5750,Tests_failed,5496fd2e3e9d35b907d36d63d69df93a9cee7a7cca739530f1354427bfaa756c,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,0.010223865509033203,0.04660344123840332,0.04442596435546875,0.014898061752319336,0.043305158615112305,0.04065394401550293,0.043709516525268555,0.15832209587097168,0.11688232421875,0.6519486904144287,0.37714195251464844,0.030454635620117188,0.05414247512817383,0.02985548973083496,0.054229021072387695,0.05568194389343262,0.0525052547454834,0.05197286605834961,0.05182242393493652,0.05333828926086426,0.05208945274353027,0.05332493782043457,0.05189681053161621,0.08356189727783203,0.08516693115234375,0.6824631690979004,0.4117567539215088,0.052205801010131836,0.051920175552368164,0.05272030830383301,0.052133798599243164,0.051451921463012695 diff --git a/results/combined/merges_timed/brettwooldridge/sparsebitset.csv b/results/combined/merges_timed/brettwooldridge/sparsebitset.csv index 56cf1c3305..757364bf52 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,True,7,86,270,3,True,7,Tests_passed,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,True,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,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,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,3570a0fdcb54c47139c6048138f5516b5152120f8aefe8b82b91108e8744cf85,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,5d55d8d6d83e428647acc9897d0f7a44552dc9fda0b97cb43e0d5858678c5da7,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,0.037149906158447266,0.05401444435119629,0.03854012489318848,0.03196978569030762,0.05214834213256836,0.03739500045776367,0.02592754364013672,0.2542381286621094,0.16827154159545898,2.279326915740967,0.699650764465332,0.06432867050170898,0.10108661651611328,0.06761765480041504,0.10323452949523926,0.1038210391998291 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,True,7,86,270,3,True,7,Tests_passed,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,True,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,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,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,3570a0fdcb54c47139c6048138f5516b5152120f8aefe8b82b91108e8744cf85,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,5d55d8d6d83e428647acc9897d0f7a44552dc9fda0b97cb43e0d5858678c5da7,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,0.037149906158447266,0.05401444435119629,0.03854012489318848,0.03196978569030762,0.05214834213256836,0.03739500045776367,0.02592754364013672,0.2542381286621094,0.16827154159545898,2.279326915740967,0.699650764465332,0.06432867050170898,0.10108661651611328,0.06761765480041504,0.10323452949523926,0.1038210391998291,0.09591341018676758,0.09908175468444824,0.0995635986328125,0.10387802124023438,0.09623503684997559,0.09724116325378418,0.09871959686279297,0.1514887809753418,0.1605076789855957,2.222870349884033,0.6949687004089355,0.0996408462524414,0.09896016120910645,0.0977630615234375,0.09373831748962402,0.10265755653381348 diff --git a/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv b/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv index 61b3cae085..bcf5a11c3b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,Tests_passed,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,True,17,140,1466,2,True,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,True,17,True,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,372529464b657ce5f91cee6fe1c5ba3bee9f84c2b649b6f37ebf107caacc3eff,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,e54cd8783e59b8165d611f491cb1121259faa46f72505ba1e2955336fe993e3f,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,ad441841a707bf59be6bc3201fb2fd0b0e7f135255d894261dc53fa2b8968f8e,Merge_failed,53ab9952120adeaf05be9bfec343c3a6b97c58e47b7af7ac95979bcfe62ac349,Merge_failed,53ab9952120adeaf05be9bfec343c3a6b97c58e47b7af7ac95979bcfe62ac349,Merge_failed,05fe8777cbaa0b3580d778d7880c773d0c118b935a4b64be82a11d029da44e8e,Merge_failed,a8ac873bf4210866ebd0194ba02c07d219a2573d59730d7cce60b1104cfcf9aa,Merge_failed,b9b204debf2d5eddb17a087dc55c98fad878700811184fe5309dc60297375cf4,Tests_passed,4dfb4dfc6d055048c2dbd37b105dba61f08fcf45b6e699045258bd6454ea865b,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,0.057235002517700195,0.047975778579711914,0.0466313362121582,0.019486188888549805,0.05224204063415527,0.04306769371032715,0.05707287788391113,0.17870306968688965,0.16486310958862305,1.7534911632537842,0.65163254737854,0.048661231994628906,0.048204898834228516,0.047509193420410156,0.05110573768615723,0.05371809005737305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,Tests_passed,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,True,17,140,1466,2,True,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,True,17,True,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,372529464b657ce5f91cee6fe1c5ba3bee9f84c2b649b6f37ebf107caacc3eff,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,e54cd8783e59b8165d611f491cb1121259faa46f72505ba1e2955336fe993e3f,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,ad441841a707bf59be6bc3201fb2fd0b0e7f135255d894261dc53fa2b8968f8e,Merge_failed,53ab9952120adeaf05be9bfec343c3a6b97c58e47b7af7ac95979bcfe62ac349,Merge_failed,53ab9952120adeaf05be9bfec343c3a6b97c58e47b7af7ac95979bcfe62ac349,Merge_failed,05fe8777cbaa0b3580d778d7880c773d0c118b935a4b64be82a11d029da44e8e,Merge_failed,a8ac873bf4210866ebd0194ba02c07d219a2573d59730d7cce60b1104cfcf9aa,Merge_failed,b9b204debf2d5eddb17a087dc55c98fad878700811184fe5309dc60297375cf4,Tests_passed,4dfb4dfc6d055048c2dbd37b105dba61f08fcf45b6e699045258bd6454ea865b,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,efcdf32fd62c86fc7ee63a00d0a2ae5acf528ba3d4a01cf5734d9dcc806f6353,Merge_failed,d7aaa13e12bc1ae2da0c6e2628ff0fa5ce1f79c28af2029f42b94b5397b9ce0d,0.057235002517700195,0.047975778579711914,0.0466313362121582,0.019486188888549805,0.05224204063415527,0.04306769371032715,0.05707287788391113,0.17870306968688965,0.16486310958862305,1.7534911632537842,0.65163254737854,0.048661231994628906,0.048204898834228516,0.047509193420410156,0.05110573768615723,0.05371809005737305,0.0486142635345459,0.04691934585571289,0.04854607582092285,0.05409574508666992,0.052756309509277344,0.05421757698059082,0.049249887466430664,0.08503937721252441,0.11765336990356445,1.7351446151733398,0.6987543106079102,0.04997086524963379,0.051203012466430664,0.05099678039550781,0.05034780502319336,0.048772335052490234 diff --git a/results/combined/merges_timed/brianm/config-magic.csv b/results/combined/merges_timed/brianm/config-magic.csv index 923dec5daa..d62fc962cf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,True,15,61,536,12,True,23,Tests_passed,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,True,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,True,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,7748651d8c623b99b0ba0156fd1580659486c8f0c98c3a08aa3148900e318b2d,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,Merge_failed,255fc390428220049b2d368a829f3c57c5c0bd0f4df9a8526482654a4baa1a01,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,2d5c3b89c5fc97a1d4606fe04c40e94df187510721dadfb3f2fb3ee70fa65a07,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,69bb6be5ac57c3b6d095f543f1bcadf6de84082786267c18eb17b1cc982c570d,Tests_failed,7933cbf4a4d272c40c467beb9563eab6742fb99b70409c11fe2109921b686d0b,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,0.04176616668701172,0.0466609001159668,0.04107403755187988,0.016126632690429688,0.040364742279052734,0.04706454277038574,0.0428926944732666,0.2882351875305176,0.2368459701538086,1.9646737575531006,0.8968715667724609,0.0449223518371582,0.0834646224975586,0.04704594612121582,0.08711361885070801,0.08157896995544434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,True,15,61,536,12,True,23,Tests_passed,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,True,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,True,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,7748651d8c623b99b0ba0156fd1580659486c8f0c98c3a08aa3148900e318b2d,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,Merge_failed,255fc390428220049b2d368a829f3c57c5c0bd0f4df9a8526482654a4baa1a01,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,2d5c3b89c5fc97a1d4606fe04c40e94df187510721dadfb3f2fb3ee70fa65a07,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,69bb6be5ac57c3b6d095f543f1bcadf6de84082786267c18eb17b1cc982c570d,Tests_failed,7933cbf4a4d272c40c467beb9563eab6742fb99b70409c11fe2109921b686d0b,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,0.04176616668701172,0.0466609001159668,0.04107403755187988,0.016126632690429688,0.040364742279052734,0.04706454277038574,0.0428926944732666,0.2882351875305176,0.2368459701538086,1.9646737575531006,0.8968715667724609,0.0449223518371582,0.0834646224975586,0.04704594612121582,0.08711361885070801,0.08157896995544434,0.08238530158996582,0.07989501953125,0.0845487117767334,0.0786583423614502,0.08290457725524902,0.0854043960571289,0.08218693733215332,0.1472468376159668,0.1705012321472168,1.9954710006713867,1.0132503509521484,0.08456707000732422,0.08263087272644043,0.08558130264282227,0.08419513702392578,0.07934165000915527 diff --git a/results/combined/merges_timed/brianm/jdbi3.csv b/results/combined/merges_timed/brianm/jdbi3.csv index d255664b84..a50574ee99 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,True,True,Tests_passed,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,True,9,27,294,5,True,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,True,9,True,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c863ff0e204e9538b6bc0a39c5074be19f4c15087647e5a2ec3a2f07ca462f1c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,04ee9275fe32a30cf0e12b246484c986c5e79a9041aa358979aa2ab16854907c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,4c0744bef4e9d7d88a6d6a74fddf1001f880a0e43e96f46e4eae388fcf894afb,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,0.04014468193054199,0.04041242599487305,0.03388571739196777,0.012419939041137695,0.03910541534423828,0.03461265563964844,0.034612417221069336,0.33057117462158203,0.24273085594177246,1.6061160564422607,0.37535667419433594,0.05207991600036621,0.07016587257385254,0.05369710922241211,0.07535004615783691,0.07306027412414551 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,True,True,Tests_passed,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,True,9,27,294,5,True,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,True,9,True,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c863ff0e204e9538b6bc0a39c5074be19f4c15087647e5a2ec3a2f07ca462f1c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,04ee9275fe32a30cf0e12b246484c986c5e79a9041aa358979aa2ab16854907c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,4c0744bef4e9d7d88a6d6a74fddf1001f880a0e43e96f46e4eae388fcf894afb,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,0.04014468193054199,0.04041242599487305,0.03388571739196777,0.012419939041137695,0.03910541534423828,0.03461265563964844,0.034612417221069336,0.33057117462158203,0.24273085594177246,1.6061160564422607,0.37535667419433594,0.05207991600036621,0.07016587257385254,0.05369710922241211,0.07535004615783691,0.07306027412414551,0.07274150848388672,0.06978702545166016,0.07404708862304688,0.07024979591369629,0.07395172119140625,0.07238507270812988,0.07376813888549805,0.14330172538757324,0.16027426719665527,1.6733732223510742,0.4523279666900635,0.0743556022644043,0.07393574714660645,0.07330894470214844,0.07270956039428711,0.07085847854614258 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 a3f89b678a..ca9ed940e1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,Tests_passed,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,True,4,9,40,2,True,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,True,4,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,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,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,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,1a18afba752490ebede2303d9c2d34562cbfa591417be6737292139c0d9b3a1a,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,0.0400090217590332,0.040825843811035156,0.031056642532348633,0.013032674789428711,0.03995847702026367,0.04093194007873535,0.04105877876281738,0.14660191535949707,0.08091402053833008,0.6507353782653809,0.2469327449798584,0.027724266052246094,0.04979109764099121,0.02801990509033203,0.05021166801452637,0.050214290618896484 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,Tests_passed,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,True,4,9,40,2,True,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,True,4,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,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,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,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,1a18afba752490ebede2303d9c2d34562cbfa591417be6737292139c0d9b3a1a,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,0.0400090217590332,0.040825843811035156,0.031056642532348633,0.013032674789428711,0.03995847702026367,0.04093194007873535,0.04105877876281738,0.14660191535949707,0.08091402053833008,0.6507353782653809,0.2469327449798584,0.027724266052246094,0.04979109764099121,0.02801990509033203,0.05021166801452637,0.050214290618896484,0.04819369316101074,0.04781770706176758,0.04650259017944336,0.047925472259521484,0.049223899841308594,0.04851198196411133,0.04865002632141113,0.07898712158203125,0.07761812210083008,0.6863579750061035,0.26828980445861816,0.04909038543701172,0.048864126205444336,0.04880118370056152,0.048751115798950195,0.049521684646606445 diff --git a/results/combined/merges_timed/brndnmtthws/hdfs.csv b/results/combined/merges_timed/brndnmtthws/hdfs.csv index 7c96a46acd..ec8b241704 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -104,refs/remotes/origin/pull/5,136f7cf97c6a687150950f7ccd1e03f2bde6a823,ee4b5ad98f64e7f278a565fe124cf316ea0d1b60,f334d6b0ffdf1dfc359d411dea29262e5aa683c1,,True,True,True,15,46,206,3,True,15,Tests_passed,04eb8d2879c632f63d8f2a71e239338125550765a2c825aa108c2b4626d1905c,True,Tests_passed,0f9283d967381f3d8f049bc76055bab2c500f2eea996a407423584fd32d60bb5,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,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,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_timedout,768c140dbae849176a235df58f5c5a28a3a8c7b554e2453062e1fe017962c5fa,,,,,,,,,,,,,0.012996435165405273,0.013573408126831055,0.014136314392089844,0.021944284439086914,0.014916181564331055,0.014269828796386719,0.014623641967773438,0.053568124771118164,0.1202082633972168,1.7166731357574463,0.5754294395446777,0.038402557373046875,0.08530879020690918,0.04093289375305176,0.08832025527954102,0.08547759056091309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +104,refs/remotes/origin/pull/5,136f7cf97c6a687150950f7ccd1e03f2bde6a823,ee4b5ad98f64e7f278a565fe124cf316ea0d1b60,f334d6b0ffdf1dfc359d411dea29262e5aa683c1,,True,True,True,15,46,206,3,True,15,Tests_passed,04eb8d2879c632f63d8f2a71e239338125550765a2c825aa108c2b4626d1905c,True,Tests_passed,0f9283d967381f3d8f049bc76055bab2c500f2eea996a407423584fd32d60bb5,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,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,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_timedout,768c140dbae849176a235df58f5c5a28a3a8c7b554e2453062e1fe017962c5fa,,,,,,,,,,,,,0.012996435165405273,0.013573408126831055,0.014136314392089844,0.021944284439086914,0.014916181564331055,0.014269828796386719,0.014623641967773438,0.053568124771118164,0.1202082633972168,1.7166731357574463,0.5754294395446777,0.038402557373046875,0.08530879020690918,0.04093289375305176,0.08832025527954102,0.08547759056091309,0.08596229553222656,0.08733844757080078,0.0876302719116211,0.08724641799926758,0.08636355400085449,0.08982658386230469,0.08789539337158203,0.14136862754821777,0.1436765193939209,2.066956043243408,0.6601545810699463,0.08437705039978027,0.08743023872375488,0.08473563194274902,0.0852203369140625,0.08617234230041504 diff --git a/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv b/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv index b87a8fbb8a..5df127fe4e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,True,436,1850,17483.0,3266,True,3386,Tests_passed,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,True,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,True,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,5a110cbc589f46e097a9ce3aa6fb4e5ac0a26bbb72fa023c35405825559f2974,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_timedout,,Merge_failed,d4f62fae4b8838fa9dd8da0a07a3a55f1db272f992bd7e4e5dae09b33fb13402,Merge_failed,5c910ae0263a928044d6368c197c8a4b876794ea7dbe722c8da563c53c57d95f,Merge_failed,1fed8ffc0a46789ff7b68046ebfda1e1a8e262a3a372a7493af363c01327f082,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,d21087ef119bc51855219416b43e53a6e2c78e0a6d5ba0959e58b2868467579a,Merge_failed,2534bf7ec191ef4e285da1d1aba3bcd7cd73d72714334348bf1200048cca5695,Merge_failed,cf6d21fc165a528154c70b534a835854e5f6e1af992ad755ed7d5ea2ae0d4abd,Merge_timedout,,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,0.18297410011291504,0.19223570823669434,0.20979046821594238,0.24015545845031738,0.20727753639221191,0.20778512954711914,0.21101617813110352,5.02060079574585,17.257490873336792,182.52923679351807,-1.0,0.5305051803588867,7.8614795207977295,0.710944414138794,7.9747209548950195,8.07580852508545 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,True,436,1850,17483.0,3266,True,3386,Tests_passed,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,True,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,True,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,5a110cbc589f46e097a9ce3aa6fb4e5ac0a26bbb72fa023c35405825559f2974,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_timedout,,Merge_failed,d4f62fae4b8838fa9dd8da0a07a3a55f1db272f992bd7e4e5dae09b33fb13402,Merge_failed,5c910ae0263a928044d6368c197c8a4b876794ea7dbe722c8da563c53c57d95f,Merge_failed,1fed8ffc0a46789ff7b68046ebfda1e1a8e262a3a372a7493af363c01327f082,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,d21087ef119bc51855219416b43e53a6e2c78e0a6d5ba0959e58b2868467579a,Merge_failed,2534bf7ec191ef4e285da1d1aba3bcd7cd73d72714334348bf1200048cca5695,Merge_failed,cf6d21fc165a528154c70b534a835854e5f6e1af992ad755ed7d5ea2ae0d4abd,Merge_timedout,,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,8b573bb948d5de755a48801cdcb48a0233d6bc5ab10ac777be0d312457f6f846,Merge_failed,819c853d22eef3c4f158f293ac2c22919ef99b118248e0065858345bc4520f03,0.18297410011291504,0.19223570823669434,0.20979046821594238,0.24015545845031738,0.20727753639221191,0.20778512954711914,0.21101617813110352,5.02060079574585,17.257490873336792,182.52923679351807,-1.0,0.5305051803588867,7.8614795207977295,0.710944414138794,7.9747209548950195,8.07580852508545,7.562366008758545,7.424055814743042,7.5373756885528564,7.627605438232422,7.526294469833374,7.480760335922241,7.61124849319458,13.596137762069702,14.838438272476196,195.59154152870178,-1.0,7.4609763622283936,7.428015947341919,7.442834138870239,7.510814666748047,7.518358469009399 diff --git a/results/combined/merges_timed/bronx/saci-vraptor.csv b/results/combined/merges_timed/bronx/saci-vraptor.csv index e5c083a7d5..2d6e6f2a58 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,True,True,Tests_passed,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,True,11,21,907,2,True,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,True,11,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_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,bbbb4abdb4e3a61d8cce1bc2d6ab3fa15e0615708ebba51c009dafd0f085bb38,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,0.009358644485473633,0.010475635528564453,0.01024007797241211,0.015230894088745117,0.010519266128540039,0.010383129119873047,0.010027408599853516,0.035186767578125,0.06761527061462402,0.5948057174682617,0.34839415550231934,0.031632423400878906,0.05544567108154297,0.030659914016723633,0.056557655334472656,0.05624246597290039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,True,True,Tests_passed,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,True,11,21,907,2,True,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,True,11,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_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,bbbb4abdb4e3a61d8cce1bc2d6ab3fa15e0615708ebba51c009dafd0f085bb38,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,737eca12a831fb00984c900bca1485ed65869ac4c431bd6b7af0042a6f440392,Tests_failed,948864a2e6795f6611713145f98b54a10a7a6de8d9e2b8df986e1824b3c96efa,0.009358644485473633,0.010475635528564453,0.01024007797241211,0.015230894088745117,0.010519266128540039,0.010383129119873047,0.010027408599853516,0.035186767578125,0.06761527061462402,0.5948057174682617,0.34839415550231934,0.031632423400878906,0.05544567108154297,0.030659914016723633,0.056557655334472656,0.05624246597290039,0.053743600845336914,0.05463385581970215,0.055329084396362305,0.05594968795776367,0.05531430244445801,0.053397178649902344,0.05446147918701172,0.08531427383422852,0.08351302146911621,0.5999267101287842,0.3833317756652832,0.05304598808288574,0.05295872688293457,0.05375838279724121,0.05322718620300293,0.05453920364379883 diff --git a/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv b/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv index 03eb724365..8e3bbe1b70 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,True,18,69,784,2,True,18,Tests_passed,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,True,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,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,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,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,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_failed,014bee0a1f198dfcebba81d3dcbd620a14b9d7dce8d7ca0704bf0120f65797bf,Tests_failed,e0672b03d2efa0bc6a22ba304fc0cb80ac2f5a3d566508b7ee1d2e53ef00e580,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,0.009642839431762695,0.009598016738891602,0.009842634201049805,0.016421794891357422,0.010534048080444336,0.010259628295898438,0.009795665740966797,0.033881187438964844,0.06402778625488281,0.5444686412811279,0.4565727710723877,0.030564308166503906,0.05404305458068848,0.031792640686035156,0.05462312698364258,0.05493497848510742 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,True,18,69,784,2,True,18,Tests_passed,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,True,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,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,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,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,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_failed,014bee0a1f198dfcebba81d3dcbd620a14b9d7dce8d7ca0704bf0120f65797bf,Tests_failed,e0672b03d2efa0bc6a22ba304fc0cb80ac2f5a3d566508b7ee1d2e53ef00e580,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,0.009642839431762695,0.009598016738891602,0.009842634201049805,0.016421794891357422,0.010534048080444336,0.010259628295898438,0.009795665740966797,0.033881187438964844,0.06402778625488281,0.5444686412811279,0.4565727710723877,0.030564308166503906,0.05404305458068848,0.031792640686035156,0.05462312698364258,0.05493497848510742,0.054616451263427734,0.05424904823303223,0.05350446701049805,0.05543398857116699,0.055280447006225586,0.05594992637634277,0.05434584617614746,0.08584189414978027,0.08613801002502441,0.6230907440185547,0.5052471160888672,0.054364681243896484,0.05299854278564453,0.053698062896728516,0.055144309997558594,0.05340886116027832 diff --git a/results/combined/merges_timed/brooklyncentral/clocker.csv b/results/combined/merges_timed/brooklyncentral/clocker.csv index 04bb1c91d1..ee36384796 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -254,refs/remotes/origin/pull/168,76e41ca0646e971450da04a2fd88a74c32acc0fa,d2afe7308db3df086f829d424adb11a3c9457c44,c3e5c77d178fc046f9e94945b93c7b6ceb592bf2,,True,True,True,18,45,644,14,True,26,Tests_passed,3529cfb0ef4ca30cbd04b1f5a5b9ba47e419ca28a0fd63540bee4ce9b5c689f7,True,Tests_passed,b9052ed29357ce0599a6b4ed13430b48ba0303c2a6206bab540630c2aa0f674a,True,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,b234ea9b900b1c6d96be30456204fcb5f6c821a936f766203c586bb4c18ac75b,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,04e9850672b70c2767627a62d241b859f43adb460cb94fee97effe478866dc7d,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,6099d3cd9596dbc8344c4204c0aa5e092924137c84f137ff93240a6960d720fd,Merge_failed,5db2878195a74a695263e1a843b57468210d4aba1d0c619276e21479503452f7,Merge_failed,c526ff556ebdd997f3959a2d41c22b51ae6e83c8999b6c90e604ecd49f947d4a,Merge_timedout,,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,0.024641036987304688,0.02517867088317871,0.028654098510742188,0.03664565086364746,0.02815532684326172,0.028856992721557617,0.028774499893188477,0.11786675453186035,0.2931327819824219,3.6853456497192383,-1.0,0.07999801635742188,0.12947845458984375,0.0678102970123291,0.12363791465759277,0.1291971206665039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +254,refs/remotes/origin/pull/168,76e41ca0646e971450da04a2fd88a74c32acc0fa,d2afe7308db3df086f829d424adb11a3c9457c44,c3e5c77d178fc046f9e94945b93c7b6ceb592bf2,,True,True,True,18,45,644,14,True,26,Tests_passed,3529cfb0ef4ca30cbd04b1f5a5b9ba47e419ca28a0fd63540bee4ce9b5c689f7,True,Tests_passed,b9052ed29357ce0599a6b4ed13430b48ba0303c2a6206bab540630c2aa0f674a,True,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,b234ea9b900b1c6d96be30456204fcb5f6c821a936f766203c586bb4c18ac75b,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,04e9850672b70c2767627a62d241b859f43adb460cb94fee97effe478866dc7d,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,6099d3cd9596dbc8344c4204c0aa5e092924137c84f137ff93240a6960d720fd,Merge_failed,5db2878195a74a695263e1a843b57468210d4aba1d0c619276e21479503452f7,Merge_failed,c526ff556ebdd997f3959a2d41c22b51ae6e83c8999b6c90e604ecd49f947d4a,Merge_timedout,,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,Merge_failed,0e092c889f03c24f9a737337fbf1e42cf3e1abac8e9269520af7383d825400ac,0.024641036987304688,0.02517867088317871,0.028654098510742188,0.03664565086364746,0.02815532684326172,0.028856992721557617,0.028774499893188477,0.11786675453186035,0.2931327819824219,3.6853456497192383,-1.0,0.07999801635742188,0.12947845458984375,0.0678102970123291,0.12363791465759277,0.1291971206665039,0.1244957447052002,0.1190035343170166,0.11826539039611816,0.1286611557006836,0.12784385681152344,0.1274881362915039,0.12899994850158691,0.1954035758972168,0.25887608528137207,3.9307680130004883,-1.0,0.12458086013793945,0.11945891380310059,0.12494111061096191,0.09443783760070801,0.11825704574584961 diff --git a/results/combined/merges_timed/brunoribeiro/sql-parser.csv b/results/combined/merges_timed/brunoribeiro/sql-parser.csv index d6e449d44f..a641cabcd8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,True,23,48,383,2,True,23,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,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,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,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,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,ee85e2f4e2e1a805ee3b76065172f6f4f190bc54d5eb6a8026902b295347b03e,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,0.04292464256286621,0.05312371253967285,0.07389616966247559,0.026552200317382812,0.04465627670288086,0.05565643310546875,0.04913020133972168,0.21632599830627441,0.12616539001464844,1.5211899280548096,0.5293316841125488,0.04656720161437988,0.07761263847351074,0.044690847396850586,0.07782912254333496,0.08037471771240234 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,True,23,48,383,2,True,23,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,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,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,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,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,ee85e2f4e2e1a805ee3b76065172f6f4f190bc54d5eb6a8026902b295347b03e,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,0.04292464256286621,0.05312371253967285,0.07389616966247559,0.026552200317382812,0.04465627670288086,0.05565643310546875,0.04913020133972168,0.21632599830627441,0.12616539001464844,1.5211899280548096,0.5293316841125488,0.04656720161437988,0.07761263847351074,0.044690847396850586,0.07782912254333496,0.08037471771240234,0.07992815971374512,0.07948684692382812,0.08272123336791992,0.07888913154602051,0.07985663414001465,0.08078265190124512,0.0804452896118164,0.11905837059020996,0.11189699172973633,1.533231258392334,0.5698504447937012,0.07756376266479492,0.07807636260986328,0.07904887199401855,0.07910919189453125,0.07832193374633789 diff --git a/results/combined/merges_timed/bryncooke/cdi-unit.csv b/results/combined/merges_timed/bryncooke/cdi-unit.csv index 97873fb627..5c666e8a83 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,Tests_passed,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,True,48,137,2037,3,True,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,True,48,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,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,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_failed,4a436f6b4d4dd521bf85d599a5553a8248e1c6ae030f96b02a701984db094afa,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,0.04314994812011719,0.043294668197631836,0.04682183265686035,0.025833845138549805,0.05108046531677246,0.04724407196044922,0.04959535598754883,0.2514514923095703,0.18256831169128418,0.04402494430541992,0.5358057022094727,0.047275543212890625,0.0855259895324707,0.04739952087402344,0.0905313491821289,0.09464001655578613 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,Tests_passed,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,True,48,137,2037,3,True,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,True,48,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,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,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_failed,4a436f6b4d4dd521bf85d599a5553a8248e1c6ae030f96b02a701984db094afa,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,0.04314994812011719,0.043294668197631836,0.04682183265686035,0.025833845138549805,0.05108046531677246,0.04724407196044922,0.04959535598754883,0.2514514923095703,0.18256831169128418,0.04402494430541992,0.5358057022094727,0.047275543212890625,0.0855259895324707,0.04739952087402344,0.0905313491821289,0.09464001655578613,0.08808088302612305,0.0904228687286377,0.09200453758239746,0.09187150001525879,0.08825016021728516,0.0930337905883789,0.09076237678527832,0.14945268630981445,0.14160943031311035,0.10223722457885742,0.564091682434082,0.09029126167297363,0.0847311019897461,0.09100627899169922,0.09027957916259766,0.08991432189941406 diff --git a/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv b/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv index 3cd418b48e..3ea402e31e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,True,True,Tests_passed,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,True,19,129,468,17,True,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,True,26,True,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,664df9508bf1fff05c1da32bb7736dfa7585649776cd3f51796814efaca3b0f5,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,Merge_failed,19a267502dbe7beb38cc5f9980695f727bb7ea3e6b561359656a707e1a625ff9,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,04e3400e5cd120f02d6cb5f40fb2cd028028736b51f0a508642706fc0f62765a,Merge_failed,3427e8ec1a11099c4e5f5a7064823933a0d4d4c255a091a11e562b8c7580b590,Merge_failed,3427e8ec1a11099c4e5f5a7064823933a0d4d4c255a091a11e562b8c7580b590,Merge_failed,317c4adfe793637e28f4793d22a14aa46baa0efe67cb0f2b7ed0c42393811840,Merge_failed,d48dca131687d6828e0d16765b48bfa6552872a6057035c6672bcad6536fcfe2,Merge_failed,b8689b6871123e0261535921832270d385353a18e2056e785e5e171cdabde0dd,Merge_failed,419a4a8a3b9ba1c03c323a7e585a401eda0e8cbcd76c0a3d790edea5484aaef0,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,0.012783288955688477,0.01258230209350586,0.012273788452148438,0.018247127532958984,0.012543916702270508,0.012357234954833984,0.01270914077758789,0.14211821556091309,0.5621793270111084,2.3340699672698975,0.5172312259674072,0.12695693969726562,0.14780759811401367,0.12475061416625977,0.15589070320129395,0.15255308151245117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,True,True,Tests_passed,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,True,19,129,468,17,True,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,True,26,True,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,664df9508bf1fff05c1da32bb7736dfa7585649776cd3f51796814efaca3b0f5,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,Merge_failed,19a267502dbe7beb38cc5f9980695f727bb7ea3e6b561359656a707e1a625ff9,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,04e3400e5cd120f02d6cb5f40fb2cd028028736b51f0a508642706fc0f62765a,Merge_failed,3427e8ec1a11099c4e5f5a7064823933a0d4d4c255a091a11e562b8c7580b590,Merge_failed,3427e8ec1a11099c4e5f5a7064823933a0d4d4c255a091a11e562b8c7580b590,Merge_failed,317c4adfe793637e28f4793d22a14aa46baa0efe67cb0f2b7ed0c42393811840,Merge_failed,d48dca131687d6828e0d16765b48bfa6552872a6057035c6672bcad6536fcfe2,Merge_failed,b8689b6871123e0261535921832270d385353a18e2056e785e5e171cdabde0dd,Merge_failed,419a4a8a3b9ba1c03c323a7e585a401eda0e8cbcd76c0a3d790edea5484aaef0,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,8cb8fde8300e5408a5bb9d1ef7dc8e6bca05fa4a241d1db1cba19f7960193e99,Merge_failed,e71b9390e10fd2969d945521c67e24181a612f7f6a02cefaf157eb7ef53bc6ec,0.012783288955688477,0.01258230209350586,0.012273788452148438,0.018247127532958984,0.012543916702270508,0.012357234954833984,0.01270914077758789,0.14211821556091309,0.5621793270111084,2.3340699672698975,0.5172312259674072,0.12695693969726562,0.14780759811401367,0.12475061416625977,0.15589070320129395,0.15255308151245117,0.1512281894683838,0.14708924293518066,0.14612698554992676,0.1467132568359375,0.1477062702178955,0.14618325233459473,0.14694833755493164,0.3052549362182617,0.4187757968902588,2.3228402137756348,0.6500108242034912,0.1467149257659912,0.14566445350646973,0.14970779418945312,0.14744806289672852,0.150193452835083 diff --git a/results/combined/merges_timed/bserdar/jcliff.csv b/results/combined/merges_timed/bserdar/jcliff.csv index 1f05052810..cafbac5efa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,True,True,True,3,4,6,2,True,3,Tests_passed,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,True,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,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,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,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,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,0f8b9df8ce5d19999edc3d12dcb27bd534a419600df26a36e6166e12ee24892f,Tests_failed,5f0bd83f0d319ded58c496344b2b58d616e52df674cd18daeb571c51c4026b47,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,0.04919242858886719,0.0510249137878418,0.05398416519165039,0.018585205078125,0.05256485939025879,0.04236340522766113,0.037043094635009766,0.17114949226379395,0.10742735862731934,0.9970958232879639,0.33173394203186035,0.03582286834716797,0.06052041053771973,0.035883426666259766,0.0617213249206543,0.06363797187805176 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,True,True,True,3,4,6,2,True,3,Tests_passed,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,True,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,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,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,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,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,0f8b9df8ce5d19999edc3d12dcb27bd534a419600df26a36e6166e12ee24892f,Tests_failed,5f0bd83f0d319ded58c496344b2b58d616e52df674cd18daeb571c51c4026b47,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,0.04919242858886719,0.0510249137878418,0.05398416519165039,0.018585205078125,0.05256485939025879,0.04236340522766113,0.037043094635009766,0.17114949226379395,0.10742735862731934,0.9970958232879639,0.33173394203186035,0.03582286834716797,0.06052041053771973,0.035883426666259766,0.0617213249206543,0.06363797187805176,0.0593721866607666,0.05997490882873535,0.0612645149230957,0.06018710136413574,0.06333470344543457,0.06274580955505371,0.06239461898803711,0.09424448013305664,0.0933692455291748,1.0111777782440186,0.36380887031555176,0.06058216094970703,0.05885648727416992,0.0591280460357666,0.060552120208740234,0.05915188789367676 diff --git a/results/combined/merges_timed/btrplace/scheduler.csv b/results/combined/merges_timed/btrplace/scheduler.csv index 872415b8a8..7bfa4a6ba0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,True,23,66,1095,3,True,23,Tests_passed,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,True,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,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,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,efc56460b4fc163e2a9f666c7dbf17c1190186eda8800d34c4c4fc3dd851610f,Merge_failed,ce75f243e2e209c6e44f7e565ca19a304cf7fe690ead3b36ae82ff0e5244e072,Merge_failed,c9efc370ac1a24f669d78e2f72b406492be2b6235932f382efdfb56c768640ba,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,0.0537419319152832,0.03619098663330078,0.06673502922058105,0.021783113479614258,0.06121206283569336,0.05717206001281738,0.06220436096191406,0.31375718116760254,0.2001039981842041,1.2184102535247803,0.5804166793823242,0.049889564514160156,0.07584452629089355,0.049539804458618164,0.07538223266601562,0.07624316215515137 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,True,23,66,1095,3,True,23,Tests_passed,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,True,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,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,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,efc56460b4fc163e2a9f666c7dbf17c1190186eda8800d34c4c4fc3dd851610f,Merge_failed,ce75f243e2e209c6e44f7e565ca19a304cf7fe690ead3b36ae82ff0e5244e072,Merge_failed,c9efc370ac1a24f669d78e2f72b406492be2b6235932f382efdfb56c768640ba,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,Merge_failed,41d9c78ece044a950ca9b10d78d60eaf70d3a5d63c3347310b120b40b628a27c,0.0537419319152832,0.03619098663330078,0.06673502922058105,0.021783113479614258,0.06121206283569336,0.05717206001281738,0.06220436096191406,0.31375718116760254,0.2001039981842041,1.2184102535247803,0.5804166793823242,0.049889564514160156,0.07584452629089355,0.049539804458618164,0.07538223266601562,0.07624316215515137,0.0767049789428711,0.07569003105163574,0.07768893241882324,0.07610368728637695,0.07972073554992676,0.07640576362609863,0.07842493057250977,0.13204336166381836,0.1393585205078125,1.3454835414886475,0.7123048305511475,0.07677102088928223,0.07813215255737305,0.07586121559143066,0.0750424861907959,0.07590866088867188 diff --git a/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv b/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv index 27f36c5242..19fb3d1ea3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -59,refs/heads/master,add022f6eee649d0bb3a578dbd43412abe750398,07e445684c08c14cb559b65b8e950dc48fe8f24d,1e845e6e49fcd1c4da5690fbc9c4514ae445bc39,,True,True,True,31,128,1318,3,True,31,Tests_passed,85c8d5cdba361e5e2979b588433736af6bc7e5b6c3938da2cb830999c02b37e1,True,Tests_passed,8566262c7b23ea71ca58cdc08694a779778b65c7d1ecaa99f2fbb4bf4fa494f8,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,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_failed,3c3c6f0d887050bd481f695a9a5c6a490ae5f9fee3dca838d9c09ebb136c32a2,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,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,1c89c49c2e41761c5bacef3a303cbbcd03922e5474128cf305d00474467bf796,Tests_failed,3c3c6f0d887050bd481f695a9a5c6a490ae5f9fee3dca838d9c09ebb136c32a2,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,0.043459177017211914,0.047933101654052734,0.062213897705078125,0.024857521057128906,0.05861163139343262,0.04194307327270508,0.05280280113220215,0.23126912117004395,0.1873784065246582,0.8446598052978516,0.9811129570007324,0.0422358512878418,0.0899360179901123,0.04283785820007324,0.10292220115661621,0.08646845817565918 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +59,refs/heads/master,add022f6eee649d0bb3a578dbd43412abe750398,07e445684c08c14cb559b65b8e950dc48fe8f24d,1e845e6e49fcd1c4da5690fbc9c4514ae445bc39,,True,True,True,31,128,1318,3,True,31,Tests_passed,85c8d5cdba361e5e2979b588433736af6bc7e5b6c3938da2cb830999c02b37e1,True,Tests_passed,8566262c7b23ea71ca58cdc08694a779778b65c7d1ecaa99f2fbb4bf4fa494f8,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,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_failed,3c3c6f0d887050bd481f695a9a5c6a490ae5f9fee3dca838d9c09ebb136c32a2,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,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,1c89c49c2e41761c5bacef3a303cbbcd03922e5474128cf305d00474467bf796,Tests_failed,3c3c6f0d887050bd481f695a9a5c6a490ae5f9fee3dca838d9c09ebb136c32a2,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,0.043459177017211914,0.047933101654052734,0.062213897705078125,0.024857521057128906,0.05861163139343262,0.04194307327270508,0.05280280113220215,0.23126912117004395,0.1873784065246582,0.8446598052978516,0.9811129570007324,0.0422358512878418,0.0899360179901123,0.04283785820007324,0.10292220115661621,0.08646845817565918,0.0849158763885498,0.08082699775695801,0.08585000038146973,0.08603858947753906,0.12365865707397461,0.08473491668701172,0.08766984939575195,0.13377642631530762,0.13905835151672363,0.9151756763458252,0.9945781230926514,0.08258867263793945,0.08483171463012695,0.08362412452697754,0.09608292579650879,0.08179712295532227 diff --git a/results/combined/merges_timed/bujiio/buji-pac4j.csv b/results/combined/merges_timed/bujiio/buji-pac4j.csv index c17f6bdbd4..01753ae770 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,True,15,64,658,2,True,15,Tests_passed,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,True,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,True,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,7539d06b12858c20a246d32e745298e7da80e446a3a0aa7858be24766da09010,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,b835e8fc74b722f0d1101d97f7a301b4c2e04b1ff06ccbaa64635a0bf60e8e65,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,3724551f67f22caf7265df7389b28dfe3647ef94eb8aa31f1b124e21e8452209,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,925e4515cba45d2b7ca4c27f5f942b900ef949419445f065a2bc84b3d37d58e2,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,0.008528470993041992,0.008322715759277344,0.008201837539672852,0.013735532760620117,0.008054733276367188,0.008100509643554688,0.008189678192138672,0.03274798393249512,0.06450676918029785,0.5221312046051025,0.2962932586669922,0.03952741622924805,0.04201340675354004,0.04102134704589844,0.04189276695251465,0.0431056022644043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,True,15,64,658,2,True,15,Tests_passed,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,True,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,True,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,7539d06b12858c20a246d32e745298e7da80e446a3a0aa7858be24766da09010,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,b835e8fc74b722f0d1101d97f7a301b4c2e04b1ff06ccbaa64635a0bf60e8e65,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,3724551f67f22caf7265df7389b28dfe3647ef94eb8aa31f1b124e21e8452209,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,925e4515cba45d2b7ca4c27f5f942b900ef949419445f065a2bc84b3d37d58e2,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,0.008528470993041992,0.008322715759277344,0.008201837539672852,0.013735532760620117,0.008054733276367188,0.008100509643554688,0.008189678192138672,0.03274798393249512,0.06450676918029785,0.5221312046051025,0.2962932586669922,0.03952741622924805,0.04201340675354004,0.04102134704589844,0.04189276695251465,0.0431056022644043,0.04071784019470215,0.041577816009521484,0.04061555862426758,0.04093766212463379,0.04072260856628418,0.040906429290771484,0.04022789001464844,0.0708458423614502,0.07425808906555176,0.5757339000701904,0.3508718013763428,0.04099917411804199,0.04253125190734863,0.04130983352661133,0.042076826095581055,0.04043292999267578 diff --git a/results/combined/merges_timed/buschmais/extended-objects.csv b/results/combined/merges_timed/buschmais/extended-objects.csv index 5007493dc1..4d3d7e2fd6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,True,135,284,1152,2,True,135,Tests_passed,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,True,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,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_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,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_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,288398247cd08403eb92a794f1314b4e9d7d672354209b50ec3aabd3b8b82b98,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,0.02429819107055664,0.023638486862182617,0.02200460433959961,0.032114505767822266,0.022323131561279297,0.03426551818847656,0.034597158432006836,0.04926919937133789,0.08048868179321289,0.9528591632843018,1.2398097515106201,0.0504300594329834,0.08217334747314453,0.0517275333404541,0.08249020576477051,0.07912945747375488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,True,135,284,1152,2,True,135,Tests_passed,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,True,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,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_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,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_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,288398247cd08403eb92a794f1314b4e9d7d672354209b50ec3aabd3b8b82b98,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,0.02429819107055664,0.023638486862182617,0.02200460433959961,0.032114505767822266,0.022323131561279297,0.03426551818847656,0.034597158432006836,0.04926919937133789,0.08048868179321289,0.9528591632843018,1.2398097515106201,0.0504300594329834,0.08217334747314453,0.0517275333404541,0.08249020576477051,0.07912945747375488,0.08021783828735352,0.08019733428955078,0.08849096298217773,0.09062600135803223,0.08712410926818848,0.08649420738220215,0.0893869400024414,0.12160825729370117,0.11341547966003418,1.1131391525268555,1.4525926113128662,0.08046817779541016,0.08136272430419922,0.08160924911499023,0.08134007453918457,0.07850813865661621 diff --git a/results/combined/merges_timed/bytedeco/javacpp.csv b/results/combined/merges_timed/bytedeco/javacpp.csv index 8b99bc2d2a..36ace4d616 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,True,True,Tests_passed,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,True,6,29,224,2,True,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,True,6,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,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Tests_failed,e69cc8eab9a24a7ffc68b387aaa87beee0bf785063d7cf572b8b2ba1169aefef,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,0220a9290c25b154ddae1263d9af12cec8226630f2e5c8cb806fa09bc2f05a6e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,0b75a4149b906890a2563d899f7cb78c981be3688bf1102aae0798cf055f3227,Tests_failed,e69cc8eab9a24a7ffc68b387aaa87beee0bf785063d7cf572b8b2ba1169aefef,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03695797920227051,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.1036531925201416,5.2480409145355225,0.8933274745941162,0.06820106506347656,0.07416296005249023,0.05753302574157715,0.07181739807128906,0.07483863830566406 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,True,True,Tests_passed,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,True,6,29,224,2,True,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,True,6,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,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Tests_failed,e69cc8eab9a24a7ffc68b387aaa87beee0bf785063d7cf572b8b2ba1169aefef,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,0220a9290c25b154ddae1263d9af12cec8226630f2e5c8cb806fa09bc2f05a6e,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,0b75a4149b906890a2563d899f7cb78c981be3688bf1102aae0798cf055f3227,Tests_failed,e69cc8eab9a24a7ffc68b387aaa87beee0bf785063d7cf572b8b2ba1169aefef,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03695797920227051,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.1036531925201416,5.2480409145355225,0.8933274745941162,0.06820106506347656,0.07416296005249023,0.05753302574157715,0.07181739807128906,0.07483863830566406,0.05928802490234375,0.07303500175476074,0.07671904563903809,0.0767219066619873,0.05761003494262695,0.059393882751464844,0.07758188247680664,0.11407947540283203,0.14381790161132812,5.631528854370117,1.068880319595337,0.05707812309265137,0.0744636058807373,0.07259202003479004,0.07326102256774902,0.05943441390991211 diff --git a/results/combined/merges_timed/caelum/vraptor-console.csv b/results/combined/merges_timed/caelum/vraptor-console.csv index 551ea98949..9e6a71282b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,True,True,True,5,8,40,2,True,5,Tests_passed,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,True,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,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,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Tests_failed,53daea6c54a628f9e50bd4d6c0975b8a6f294f887eb5f4983b9d2966881b9860,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,b79944490fe6dfc19a2a6f297ce487e05b127d2e3bb74b7e5322d004f1efaaf2,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,22a792a896c135c599de00554dec3382d89551c7c58437235f30d2b55cb0f922,Tests_failed,8c6ec3f923c26df0d6701ada120fa932ee41b88a4cd104d1d96e0801c0c4bfda,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,0.03743886947631836,0.03560638427734375,0.03322124481201172,0.01361083984375,0.03968310356140137,0.03226590156555176,0.04080796241760254,0.16326403617858887,0.10766959190368652,0.51505446434021,0.31754302978515625,0.03931140899658203,0.04053473472595215,0.04069995880126953,0.04139447212219238,0.04420042037963867 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,True,True,True,5,8,40,2,True,5,Tests_passed,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,True,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,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,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Tests_failed,53daea6c54a628f9e50bd4d6c0975b8a6f294f887eb5f4983b9d2966881b9860,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,b79944490fe6dfc19a2a6f297ce487e05b127d2e3bb74b7e5322d004f1efaaf2,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,22a792a896c135c599de00554dec3382d89551c7c58437235f30d2b55cb0f922,Tests_failed,8c6ec3f923c26df0d6701ada120fa932ee41b88a4cd104d1d96e0801c0c4bfda,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,0.03743886947631836,0.03560638427734375,0.03322124481201172,0.01361083984375,0.03968310356140137,0.03226590156555176,0.04080796241760254,0.16326403617858887,0.10766959190368652,0.51505446434021,0.31754302978515625,0.03931140899658203,0.04053473472595215,0.04069995880126953,0.04139447212219238,0.04420042037963867,0.041619300842285156,0.04272150993347168,0.04287910461425781,0.04141569137573242,0.042667388916015625,0.04159903526306152,0.04004311561584473,0.07240605354309082,0.07628178596496582,0.5387613773345947,0.36988401412963867,0.041174888610839844,0.042073726654052734,0.0418248176574707,0.04331541061401367,0.04191088676452637 diff --git a/results/combined/merges_timed/caelum/vraptor-environment.csv b/results/combined/merges_timed/caelum/vraptor-environment.csv index 8d6707ab9b..41fb7a18ac 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,True,17,40,415,4,True,17,Tests_passed,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,True,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,True,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,Merge_failed,8935a1f7450a63fc34dee6e0859cb58a098f8c9c4352e1a465e7327449f586d2,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,92d1bea2fb5fdce8cb9b088a81fe6cc3c7f463da349dad8cdc91dfb5ae46c13a,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,0.008309125900268555,0.00828862190246582,0.007877111434936523,0.01323556900024414,0.007863521575927734,0.007895708084106445,0.007858037948608398,0.0561823844909668,0.17727375030517578,1.028254747390747,0.391049861907959,0.0642092227935791,0.06562447547912598,0.06872224807739258,0.07404875755310059,0.07255434989929199 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,True,17,40,415,4,True,17,Tests_passed,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,True,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,True,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,Merge_failed,8935a1f7450a63fc34dee6e0859cb58a098f8c9c4352e1a465e7327449f586d2,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,92d1bea2fb5fdce8cb9b088a81fe6cc3c7f463da349dad8cdc91dfb5ae46c13a,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,0.008309125900268555,0.00828862190246582,0.007877111434936523,0.01323556900024414,0.007863521575927734,0.007895708084106445,0.007858037948608398,0.0561823844909668,0.17727375030517578,1.028254747390747,0.391049861907959,0.0642092227935791,0.06562447547912598,0.06872224807739258,0.07404875755310059,0.07255434989929199,0.0704960823059082,0.06665515899658203,0.07043123245239258,0.06477642059326172,0.07782649993896484,0.07685518264770508,0.07543253898620605,0.1391921043395996,0.16688823699951172,1.1470942497253418,0.47340917587280273,0.07147955894470215,0.07240819931030273,0.07254934310913086,0.0735313892364502,0.06945919990539551 diff --git a/results/combined/merges_timed/campagnelaboratory/metar.csv b/results/combined/merges_timed/campagnelaboratory/metar.csv index 07773d7635..26143e08a0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -112,refs/heads/master,61182b0126310c7d1928e46a272f2e0a45e60627,2f9f9f0632c66144b9e64ac972d4b1c28a5658a7,07b736d27431c9d7db5768a8d13da0b30eff5217,,True,True,True,20,567,5822.0,5,True,20,Tests_passed,bcc741c9fc5c52f601790a2ac1e943c59950b10e3449469c87edf43303c4d33e,True,Tests_passed,7c95a505066ee15005c8fa7160004b6191e9af61dc404cb1e445200c8e046aa3,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,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,Tests_passed,da82b5792d65e74168aa64ca8313244b749e1eb6008406afeb0575ac01cebaea,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,65d31f271aee938d8179e42df537bd392996fd076ecc7fb2de9385960f553aae,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Tests_passed,da82b5792d65e74168aa64ca8313244b749e1eb6008406afeb0575ac01cebaea,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,0.08980941772460938,0.1245880126953125,0.09685039520263672,0.16313457489013672,0.13304591178894043,0.09218788146972656,0.1078639030456543,0.35518836975097656,0.38462162017822266,0.10971474647521973,0.8491654396057129,0.21202397346496582,0.5496370792388916,0.20643162727355957,0.5284209251403809,0.4968376159667969 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +112,refs/heads/master,61182b0126310c7d1928e46a272f2e0a45e60627,2f9f9f0632c66144b9e64ac972d4b1c28a5658a7,07b736d27431c9d7db5768a8d13da0b30eff5217,,True,True,True,20,567,5822.0,5,True,20,Tests_passed,bcc741c9fc5c52f601790a2ac1e943c59950b10e3449469c87edf43303c4d33e,True,Tests_passed,7c95a505066ee15005c8fa7160004b6191e9af61dc404cb1e445200c8e046aa3,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,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,Tests_passed,da82b5792d65e74168aa64ca8313244b749e1eb6008406afeb0575ac01cebaea,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,65d31f271aee938d8179e42df537bd392996fd076ecc7fb2de9385960f553aae,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Tests_passed,da82b5792d65e74168aa64ca8313244b749e1eb6008406afeb0575ac01cebaea,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,0.08980941772460938,0.1245880126953125,0.09685039520263672,0.16313457489013672,0.13304591178894043,0.09218788146972656,0.1078639030456543,0.35518836975097656,0.38462162017822266,0.10971474647521973,0.8491654396057129,0.21202397346496582,0.5496370792388916,0.20643162727355957,0.5284209251403809,0.4968376159667969,0.535491943359375,0.49498772621154785,0.5629477500915527,0.520134687423706,0.5563263893127441,0.5105440616607666,0.5666210651397705,0.6643805503845215,0.7120170593261719,0.5236225128173828,1.3175604343414307,0.5429346561431885,0.502213716506958,0.5368471145629883,0.48798584938049316,0.5409295558929443 diff --git a/results/combined/merges_timed/camsys/onebusaway-application-modules.csv b/results/combined/merges_timed/camsys/onebusaway-application-modules.csv index 40f10fa2aa..a42bc3debc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -590,refs/remotes/origin/pull/139,a69d7b197eba2af2372cec23b93f547cb68342db,712aa4df21cf5249e26538de0f6a649ccd62cfde,c6116bb0dd552fe5c3b1edb98258d5223d808ad4,,True,True,True,63,109,399.0,44,True,63,Tests_passed,8fb373a62eb9d694c6e7431a5c10d5b37440528279eef8884a7f0a8dae56a46c,True,Tests_passed,c6356e272dab48b5fff87aa19e50a7d6adc8fed72bfad14a0c32e64f0dd5d85f,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,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,fe88493a1932f4ea26ada1123e70d9a9dc7962d7669b57a4fd1d4d3f50c1c66d,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,88a78cfd3abfc05ba1b0c391db383389201c1076e264a4ac7cf44b5b4c2338a6,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,91dc5ae88db318901060c71d2d585addced052397966bf9f50b5397826003b91,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,0.03401994705200195,0.03522348403930664,0.03727269172668457,0.053731679916381836,0.0368649959564209,0.037052154541015625,0.03722786903381348,0.6336073875427246,2.4250152111053467,1.6556003093719482,1.245051383972168,0.5469458103179932,0.5872797966003418,0.5474822521209717,0.5947318077087402,0.5848312377929688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +590,refs/remotes/origin/pull/139,a69d7b197eba2af2372cec23b93f547cb68342db,712aa4df21cf5249e26538de0f6a649ccd62cfde,c6116bb0dd552fe5c3b1edb98258d5223d808ad4,,True,True,True,63,109,399.0,44,True,63,Tests_passed,8fb373a62eb9d694c6e7431a5c10d5b37440528279eef8884a7f0a8dae56a46c,True,Tests_passed,c6356e272dab48b5fff87aa19e50a7d6adc8fed72bfad14a0c32e64f0dd5d85f,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,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,fe88493a1932f4ea26ada1123e70d9a9dc7962d7669b57a4fd1d4d3f50c1c66d,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,88a78cfd3abfc05ba1b0c391db383389201c1076e264a4ac7cf44b5b4c2338a6,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,91dc5ae88db318901060c71d2d585addced052397966bf9f50b5397826003b91,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,0.03401994705200195,0.03522348403930664,0.03727269172668457,0.053731679916381836,0.0368649959564209,0.037052154541015625,0.03722786903381348,0.6336073875427246,2.4250152111053467,1.6556003093719482,1.245051383972168,0.5469458103179932,0.5872797966003418,0.5474822521209717,0.5947318077087402,0.5848312377929688,0.548236608505249,0.558560848236084,0.5510444641113281,0.5548570156097412,0.554201602935791,0.5589876174926758,0.5543370246887207,1.2619428634643555,1.654923439025879,2.307471513748169,1.827554702758789,0.5497665405273438,0.5436716079711914,0.54302978515625,0.547238826751709,0.5516812801361084 diff --git a/results/combined/merges_timed/camunda/camunda-archetypes.csv b/results/combined/merges_timed/camunda/camunda-archetypes.csv index 102b2f8a65..45aa5959e6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,True,141,543,4307,23,True,147,Tests_passed,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,True,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,True,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,b2d6ae170cf5a29aa25a8d1761ea49aebeb03b5c753c28d8ae8ea26917ee2147,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,Merge_failed,70da0f752ba0e322b729325f74a55bfec9c1189fbc575adfa4248677e1db0ae5,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,d00cae64ff8bafceee6244b8ee441b96b46b62f4c92926f5fee309151766a027,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,0e34751bd8042bea0b1d0836a7f8cbac841d57273378339d51d15faa934a1dc3,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,0.06413102149963379,0.0640265941619873,0.07694721221923828,0.03226184844970703,0.06177377700805664,0.05802011489868164,0.057660579681396484,1.4624695777893066,1.5384533405303955,3.5557923316955566,0.30138134956359863,0.14500093460083008,0.40178823471069336,0.13017058372497559,0.3868553638458252,0.401094913482666 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,True,141,543,4307,23,True,147,Tests_passed,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,True,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,True,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,b2d6ae170cf5a29aa25a8d1761ea49aebeb03b5c753c28d8ae8ea26917ee2147,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,Merge_failed,70da0f752ba0e322b729325f74a55bfec9c1189fbc575adfa4248677e1db0ae5,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,d00cae64ff8bafceee6244b8ee441b96b46b62f4c92926f5fee309151766a027,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,0e34751bd8042bea0b1d0836a7f8cbac841d57273378339d51d15faa934a1dc3,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,0.06413102149963379,0.0640265941619873,0.07694721221923828,0.03226184844970703,0.06177377700805664,0.05802011489868164,0.057660579681396484,1.4624695777893066,1.5384533405303955,3.5557923316955566,0.30138134956359863,0.14500093460083008,0.40178823471069336,0.13017058372497559,0.3868553638458252,0.401094913482666,0.3797304630279541,0.36728739738464355,0.3843367099761963,0.3831620216369629,0.3733251094818115,0.3833169937133789,0.37961649894714355,0.7899935245513916,1.0069358348846436,3.938314914703369,0.6319515705108643,0.37261271476745605,0.38333559036254883,0.3780703544616699,0.38776516914367676,0.3654634952545166 diff --git a/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv b/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv index c707493499..78607395ef 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,True,11,40,211,4,True,13,Tests_passed,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,True,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,True,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,101228a6d06446b22f705edf27ba7ad51e8e18856131f038a4ab083031b180a1,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Tests_failed,2c8f8957d45786c9dcc3719bee51f4880c4c8f2d631fcf4ef8acdca61effcfc8,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,7e503fa380d41167ca5233c203cc1142a086edda0bce57ba1f3db152e259ec71,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,4e97715168cb28008d6e6028f6b5532f9914689ec79545686d280c8b03200b23,Tests_failed,264515cd7c937e8f136fa78df0f4c17bbc88067823f3fa8500bbf7dd8db01462,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,0.017400026321411133,0.018187999725341797,0.020037174224853516,0.029251813888549805,0.020138978958129883,0.019504785537719727,0.019786596298217773,0.049218177795410156,0.07809782028198242,0.7609455585479736,0.5647528171539307,0.0574498176574707,0.0577392578125,0.041092872619628906,0.057898521423339844,0.05636334419250488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,True,11,40,211,4,True,13,Tests_passed,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,True,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,True,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,101228a6d06446b22f705edf27ba7ad51e8e18856131f038a4ab083031b180a1,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Tests_failed,2c8f8957d45786c9dcc3719bee51f4880c4c8f2d631fcf4ef8acdca61effcfc8,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,7e503fa380d41167ca5233c203cc1142a086edda0bce57ba1f3db152e259ec71,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,4e97715168cb28008d6e6028f6b5532f9914689ec79545686d280c8b03200b23,Tests_failed,264515cd7c937e8f136fa78df0f4c17bbc88067823f3fa8500bbf7dd8db01462,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,0.017400026321411133,0.018187999725341797,0.020037174224853516,0.029251813888549805,0.020138978958129883,0.019504785537719727,0.019786596298217773,0.049218177795410156,0.07809782028198242,0.7609455585479736,0.5647528171539307,0.0574498176574707,0.0577392578125,0.041092872619628906,0.057898521423339844,0.05636334419250488,0.060198068618774414,0.05709385871887207,0.055849313735961914,0.05891847610473633,0.059523582458496094,0.063995361328125,0.06070685386657715,0.09828066825866699,0.10377168655395508,0.9577023983001709,0.6828470230102539,0.05797696113586426,0.04303264617919922,0.05513167381286621,0.055647850036621094,0.057303428649902344 diff --git a/results/combined/merges_timed/carbonado/carbonado.csv b/results/combined/merges_timed/carbonado/carbonado.csv index d9178c4e1b..06ada14840 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,True,13,22,111,2,True,13,Tests_passed,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,True,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,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,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Merge_timedout,,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,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,a118ae3a3102cc6f3ebc55828990d8fd6a1cf4918702c7b008117455a03735f6,Merge_timedout,,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,0.04558110237121582,0.05028581619262695,0.05404973030090332,0.017822742462158203,0.049512386322021484,0.04705977439880371,0.04989933967590332,0.1501321792602539,0.11015629768371582,0.4259805679321289,-1.0,0.03386998176574707,0.07170557975769043,0.03402066230773926,0.08375144004821777,0.05710721015930176 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,True,13,22,111,2,True,13,Tests_passed,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,True,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,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,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Merge_timedout,,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,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,a118ae3a3102cc6f3ebc55828990d8fd6a1cf4918702c7b008117455a03735f6,Merge_timedout,,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,0.04558110237121582,0.05028581619262695,0.05404973030090332,0.017822742462158203,0.049512386322021484,0.04705977439880371,0.04989933967590332,0.1501321792602539,0.11015629768371582,0.4259805679321289,-1.0,0.03386998176574707,0.07170557975769043,0.03402066230773926,0.08375144004821777,0.05710721015930176,0.05704903602600098,0.07808613777160645,0.058228254318237305,0.05795168876647949,0.05936455726623535,0.058969974517822266,0.05778169631958008,0.0930793285369873,0.0900723934173584,0.49974918365478516,-1.0,0.057784080505371094,0.05815744400024414,0.05718874931335449,0.06022143363952637,0.05720710754394531 diff --git a/results/combined/merges_timed/carlossg/glacier-cli.csv b/results/combined/merges_timed/carlossg/glacier-cli.csv index 427a551024..ae3399660c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,Tests_passed,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,True,3,5,123,2,True,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,True,3,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,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,3596e97ff1e733b5132e1ff1fedf0da7a6aebee93363e3de9b5f11e65c1708de,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,0.007397174835205078,0.007379293441772461,0.007189273834228516,0.01239466667175293,0.0071523189544677734,0.007109880447387695,0.007359981536865234,0.029959440231323242,0.06736969947814941,0.9392759799957275,0.31084346771240234,0.04331398010253906,0.04052281379699707,0.03778076171875,0.04109787940979004,0.04061150550842285 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,Tests_passed,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,True,3,5,123,2,True,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,True,3,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,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,3596e97ff1e733b5132e1ff1fedf0da7a6aebee93363e3de9b5f11e65c1708de,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,0.007397174835205078,0.007379293441772461,0.007189273834228516,0.01239466667175293,0.0071523189544677734,0.007109880447387695,0.007359981536865234,0.029959440231323242,0.06736969947814941,0.9392759799957275,0.31084346771240234,0.04331398010253906,0.04052281379699707,0.03778076171875,0.04109787940979004,0.04061150550842285,0.03865313529968262,0.03899049758911133,0.03736090660095215,0.03768348693847656,0.03769350051879883,0.03831839561462402,0.038950204849243164,0.06667423248291016,0.08517026901245117,1.0155363082885742,0.353787899017334,0.039037466049194336,0.038715362548828125,0.0384058952331543,0.03898739814758301,0.038822174072265625 diff --git a/results/combined/merges_timed/cdi-spec/cdi-tck.csv b/results/combined/merges_timed/cdi-spec/cdi-tck.csv index 725a899339..f66cbfb841 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,True,35,47,154,40,True,62,Tests_passed,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,True,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,True,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,3365611d4efbbba176412742ae3ce9a83baed75ce415e78d6af7e0501c8d2399,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,1fa31b3c0641510d7b5fc1495acae5c34d0e43d02aa1ea6fa3dd5be2b169fcc8,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,9f607350b517d5a255e4190d9998baafb420d8161219fdbf11879540cc576374,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,0.09740996360778809,0.08274698257446289,0.09839272499084473,0.05676913261413574,0.0916743278503418,0.09497594833374023,0.11279010772705078,0.899418830871582,0.8100552558898926,4.030128240585327,1.6918931007385254,0.19634580612182617,0.28691792488098145,0.20006346702575684,0.29357290267944336,0.4199976921081543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,True,35,47,154,40,True,62,Tests_passed,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,True,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,True,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,3365611d4efbbba176412742ae3ce9a83baed75ce415e78d6af7e0501c8d2399,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,1fa31b3c0641510d7b5fc1495acae5c34d0e43d02aa1ea6fa3dd5be2b169fcc8,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,9f607350b517d5a255e4190d9998baafb420d8161219fdbf11879540cc576374,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,0.09740996360778809,0.08274698257446289,0.09839272499084473,0.05676913261413574,0.0916743278503418,0.09497594833374023,0.11279010772705078,0.899418830871582,0.8100552558898926,4.030128240585327,1.6918931007385254,0.19634580612182617,0.28691792488098145,0.20006346702575684,0.29357290267944336,0.4199976921081543,0.2814762592315674,0.3870813846588135,0.2852778434753418,0.396467924118042,0.28488802909851074,0.2877957820892334,0.2926642894744873,0.5267846584320068,0.6125054359436035,4.480252265930176,1.8476171493530273,0.28298091888427734,0.2866973876953125,0.2835354804992676,0.2836136817932129,0.3890857696533203 diff --git a/results/combined/merges_timed/cglib/cglib.csv b/results/combined/merges_timed/cglib/cglib.csv index 69b62e720c..6a6d7a93bf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,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,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_failed,33e54024713ef512fb19c695b98848a42d32d8b54d0a38fc0452a205f08b112c,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.0303652286529541,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.08227705955505371,0.03081512451171875,0.3035576343536377,0.057785749435424805,0.0808861255645752,0.05770468711853027,0.0773916244506836,0.07037854194641113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,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,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_failed,33e54024713ef512fb19c695b98848a42d32d8b54d0a38fc0452a205f08b112c,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.0303652286529541,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.08227705955505371,0.03081512451171875,0.3035576343536377,0.057785749435424805,0.0808861255645752,0.05770468711853027,0.0773916244506836,0.07037854194641113,0.053786277770996094,0.0808570384979248,0.08556818962097168,0.0782468318939209,0.05517387390136719,0.06813883781433105,0.08495664596557617,0.08911705017089844,0.12057042121887207,0.07905316352844238,0.3576626777648926,0.07866597175598145,0.08109641075134277,0.08046913146972656,0.07074546813964844,0.056029558181762695 diff --git a/results/combined/merges_timed/chargebee/chargebee-java.csv b/results/combined/merges_timed/chargebee/chargebee-java.csv index 18159273b8..ba33cb1e38 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,True,23,75,240,2,True,23,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,True,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,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_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,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_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,dcb08ee25f7a8cf92735e186236823623df332db53d1d4c216c9ee3c62f6e49e,Tests_failed,502f04a30cea256666c3ac6c14fdbb38c5ee1b4d95f915c39fc4125b835bfacb,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,0.035103797912597656,0.03714895248413086,0.03603243827819824,0.01491403579711914,0.045737504959106445,0.038839101791381836,0.04682803153991699,0.16522479057312012,0.11207294464111328,0.5762996673583984,0.4146256446838379,0.03066539764404297,0.05389833450317383,0.030909299850463867,0.054079532623291016,0.0547945499420166 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,True,23,75,240,2,True,23,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,True,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,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_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,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_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,dcb08ee25f7a8cf92735e186236823623df332db53d1d4c216c9ee3c62f6e49e,Tests_failed,502f04a30cea256666c3ac6c14fdbb38c5ee1b4d95f915c39fc4125b835bfacb,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,0.035103797912597656,0.03714895248413086,0.03603243827819824,0.01491403579711914,0.045737504959106445,0.038839101791381836,0.04682803153991699,0.16522479057312012,0.11207294464111328,0.5762996673583984,0.4146256446838379,0.03066539764404297,0.05389833450317383,0.030909299850463867,0.054079532623291016,0.0547945499420166,0.051964521408081055,0.050299644470214844,0.05216193199157715,0.051906585693359375,0.05237174034118652,0.05146026611328125,0.051944732666015625,0.08358335494995117,0.08326363563537598,0.5902910232543945,0.4598350524902344,0.052022457122802734,0.0515594482421875,0.05192089080810547,0.05169320106506348,0.051367759704589844 diff --git a/results/combined/merges_timed/chat-wane/lseq.csv b/results/combined/merges_timed/chat-wane/lseq.csv index 00e8ee3cce..a5e7685400 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,True,True,Tests_passed,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,True,58,217,3102,7,True,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,True,59,True,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bb76d4dafc96cb8a12f3c33ae792da766fe7d9a16ee5b6d74642b9d92402726c,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,2c49a592a0cc42d7dc8c8187f9181a388e5101c0fe973d5ed2c58852e7d8058e,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,99c54161dfb56677901f3cfef69aefa3874cc1608c19db758e4183dfa9f0e301,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,0.04320240020751953,0.05004167556762695,0.05167126655578613,0.01529693603515625,0.0444490909576416,0.044400691986083984,0.04057502746582031,0.44109177589416504,0.3487052917480469,2.311600923538208,1.3124470710754395,0.08978867530822754,0.08607220649719238,0.09338712692260742,0.08934974670410156,0.08824419975280762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,True,True,Tests_passed,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,True,58,217,3102,7,True,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,True,59,True,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bb76d4dafc96cb8a12f3c33ae792da766fe7d9a16ee5b6d74642b9d92402726c,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,2c49a592a0cc42d7dc8c8187f9181a388e5101c0fe973d5ed2c58852e7d8058e,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,99c54161dfb56677901f3cfef69aefa3874cc1608c19db758e4183dfa9f0e301,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,0.04320240020751953,0.05004167556762695,0.05167126655578613,0.01529693603515625,0.0444490909576416,0.044400691986083984,0.04057502746582031,0.44109177589416504,0.3487052917480469,2.311600923538208,1.3124470710754395,0.08978867530822754,0.08607220649719238,0.09338712692260742,0.08934974670410156,0.08824419975280762,0.08759689331054688,0.08604884147644043,0.08504676818847656,0.08593630790710449,0.08816981315612793,0.08680915832519531,0.08785080909729004,0.1876518726348877,0.22804808616638184,2.4200496673583984,1.356856107711792,0.08648538589477539,0.08645963668823242,0.08985638618469238,0.085235595703125,0.08666777610778809 diff --git a/results/combined/merges_timed/chrisvest/stormpot.csv b/results/combined/merges_timed/chrisvest/stormpot.csv index efbbeb143c..564315325c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,True,True,True,51,512,3234,6,True,51,Tests_passed,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,True,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,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,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,Merge_failed,8d46cc1579d21b5d310f20a8bf65e698a0658d510307d4d96e117fb943f43991,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,a311615ea0bee1def995c7ebaa1aca8a26a5c07581ccbdf00340410e433e62db,Merge_failed,0bb89c68042775476c6ed67914f8fe681ae8b39933f49b2baca955a367ae4139,Merge_failed,05f903f8aa7b2c68aef26bad960a9f00cc8709bc28dff391ffa03bf2b8863d8e,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,0.015425920486450195,0.015787601470947266,0.01669001579284668,0.02379918098449707,0.016301631927490234,0.01630997657775879,0.01653432846069336,0.10386514663696289,0.30410051345825195,5.251710653305054,1.4770362377166748,0.07888269424438477,0.15084433555603027,0.07154250144958496,0.15276122093200684,0.1551215648651123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,True,True,True,51,512,3234,6,True,51,Tests_passed,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,True,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,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,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,Merge_failed,8d46cc1579d21b5d310f20a8bf65e698a0658d510307d4d96e117fb943f43991,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,a311615ea0bee1def995c7ebaa1aca8a26a5c07581ccbdf00340410e433e62db,Merge_failed,0bb89c68042775476c6ed67914f8fe681ae8b39933f49b2baca955a367ae4139,Merge_failed,05f903f8aa7b2c68aef26bad960a9f00cc8709bc28dff391ffa03bf2b8863d8e,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,Merge_failed,633981651db5bc071c1d4155ffc1909ed0960f58f40a91a1ae6ee30b3032b969,0.015425920486450195,0.015787601470947266,0.01669001579284668,0.02379918098449707,0.016301631927490234,0.01630997657775879,0.01653432846069336,0.10386514663696289,0.30410051345825195,5.251710653305054,1.4770362377166748,0.07888269424438477,0.15084433555603027,0.07154250144958496,0.15276122093200684,0.1551215648651123,0.13901019096374512,0.14099884033203125,0.13985276222229004,0.14118480682373047,0.13974618911743164,0.1428210735321045,0.14252781867980957,0.24031829833984375,0.27486181259155273,5.009055137634277,1.7329740524291992,0.1382458209991455,0.14320969581604004,0.1404111385345459,0.14271330833435059,0.1395871639251709 diff --git a/results/combined/merges_timed/chrsan/css-selectors.csv b/results/combined/merges_timed/chrsan/css-selectors.csv index 635afcdea3..f99d910f3a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,True,True,Tests_passed,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,True,26,117,1079,2,True,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,True,26,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,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,5f98e7ffaa9ae0b32be2aa09726c768f018b0bdb85da7cbbe5922c7a051ad9b4,Tests_failed,f7e9bde7425e2625e5b52cc2552feb984877b93653a2ed8992764702be56b6af,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,0.044500112533569336,0.026561975479125977,0.04722404479980469,0.017561674118041992,0.04936385154724121,0.04936933517456055,0.040087223052978516,0.16732048988342285,0.11932873725891113,0.5018410682678223,1.0656158924102783,0.03299903869628906,0.05855250358581543,0.03327322006225586,0.05766892433166504,0.057309627532958984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,True,True,Tests_passed,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,True,26,117,1079,2,True,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,True,26,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,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,5f98e7ffaa9ae0b32be2aa09726c768f018b0bdb85da7cbbe5922c7a051ad9b4,Tests_failed,f7e9bde7425e2625e5b52cc2552feb984877b93653a2ed8992764702be56b6af,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,Tests_passed,f7a938a4439391c95f9bbd3a948a967b53c53179717999f8e52f1cfdc5e7416f,0.044500112533569336,0.026561975479125977,0.04722404479980469,0.017561674118041992,0.04936385154724121,0.04936933517456055,0.040087223052978516,0.16732048988342285,0.11932873725891113,0.5018410682678223,1.0656158924102783,0.03299903869628906,0.05855250358581543,0.03327322006225586,0.05766892433166504,0.057309627532958984,0.05661368370056152,0.055947065353393555,0.05750751495361328,0.059295654296875,0.05794811248779297,0.056467294692993164,0.059500694274902344,0.08908271789550781,0.08720731735229492,0.5348455905914307,1.0681140422821045,0.05628347396850586,0.05586671829223633,0.056465864181518555,0.05737781524658203,0.05604839324951172 diff --git a/results/combined/merges_timed/cinovo/cloudconductor-server.csv b/results/combined/merges_timed/cinovo/cloudconductor-server.csv index e353089a98..fffeab4d47 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,True,22,82,518,5,True,22,Tests_passed,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,True,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,True,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,8cdd792312fa5c90fe309de431dc7f4db0565d329c4c74ddcbc8725b16669bcf,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Tests_failed,5e83a362562be9e79351ec35e9d23ee20cc85307bd4c90d045aa88efb9a56d1b,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,626f9a78b08f1f94fa4ab600283400ffaa8e7a782845c2736708fdbef672dc58,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,ae20574b92fbfe89c1eaadafb3073e91b839555888cc2b12d951a4e3870033fb,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,0.021571874618530273,0.0218660831451416,0.01092672348022461,0.036229848861694336,0.02463817596435547,0.010862588882446289,0.02434515953063965,0.10075139999389648,0.23646163940429688,2.0650675296783447,0.4476470947265625,0.052065134048461914,0.13497090339660645,0.06478643417358398,0.10853862762451172,0.1269059181213379 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,True,22,82,518,5,True,22,Tests_passed,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,True,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,True,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,8cdd792312fa5c90fe309de431dc7f4db0565d329c4c74ddcbc8725b16669bcf,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Tests_failed,5e83a362562be9e79351ec35e9d23ee20cc85307bd4c90d045aa88efb9a56d1b,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,626f9a78b08f1f94fa4ab600283400ffaa8e7a782845c2736708fdbef672dc58,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,ae20574b92fbfe89c1eaadafb3073e91b839555888cc2b12d951a4e3870033fb,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,0.021571874618530273,0.0218660831451416,0.01092672348022461,0.036229848861694336,0.02463817596435547,0.010862588882446289,0.02434515953063965,0.10075139999389648,0.23646163940429688,2.0650675296783447,0.4476470947265625,0.052065134048461914,0.13497090339660645,0.06478643417358398,0.10853862762451172,0.1269059181213379,0.14041924476623535,0.11351656913757324,0.14312195777893066,0.1092691421508789,0.14237523078918457,0.11325430870056152,0.13117551803588867,0.2487163543701172,0.25949764251708984,2.51045560836792,0.5908205509185791,0.11266565322875977,0.13493704795837402,0.11496829986572266,0.13172173500061035,0.1449747085571289 diff --git a/results/combined/merges_timed/circuitsoftgroup/slackmc.csv b/results/combined/merges_timed/circuitsoftgroup/slackmc.csv index 2be3fabc2c..faff0ae818 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,True,True,Tests_passed,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,True,10,107,574,3,True,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,True,10,True,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,54363e06249b0eac2c8169965dd0d6d0b7c74f9ffcf00fb8dcc442fa33ea80b3,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,Merge_failed,f435def1838046f955860807bb75ddded01dfbb77811b99e94b674e97db58e9e,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,bafd7b50f3110f6f36b9ef3b9a9cb9e2ef7c4c207a8c0d0b993bf9989898e4d5,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Tests_passed,5970128d38f6bdc09aaf7b3d86711241a0d552f8ba58d5345792f17fcf9c6673,Tests_failed,630cfb54a4319261a0b0e247c36d2b2efe8dfa8a6caaea43038dd8a97b2718cb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,0.0386202335357666,0.041524410247802734,0.036334991455078125,0.012748003005981445,0.039449214935302734,0.03630876541137695,0.030121564865112305,0.23308682441711426,0.17371344566345215,1.270369291305542,0.42896437644958496,0.051889657974243164,0.052815914154052734,0.05042719841003418,0.05451679229736328,0.053780555725097656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,True,True,Tests_passed,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,True,10,107,574,3,True,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,True,10,True,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,54363e06249b0eac2c8169965dd0d6d0b7c74f9ffcf00fb8dcc442fa33ea80b3,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,Merge_failed,f435def1838046f955860807bb75ddded01dfbb77811b99e94b674e97db58e9e,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,bafd7b50f3110f6f36b9ef3b9a9cb9e2ef7c4c207a8c0d0b993bf9989898e4d5,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Tests_passed,5970128d38f6bdc09aaf7b3d86711241a0d552f8ba58d5345792f17fcf9c6673,Tests_failed,630cfb54a4319261a0b0e247c36d2b2efe8dfa8a6caaea43038dd8a97b2718cb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,0.0386202335357666,0.041524410247802734,0.036334991455078125,0.012748003005981445,0.039449214935302734,0.03630876541137695,0.030121564865112305,0.23308682441711426,0.17371344566345215,1.270369291305542,0.42896437644958496,0.051889657974243164,0.052815914154052734,0.05042719841003418,0.05451679229736328,0.053780555725097656,0.05311441421508789,0.053957223892211914,0.05394291877746582,0.06206107139587402,0.05300283432006836,0.052808523178100586,0.05397510528564453,0.10173678398132324,0.12890863418579102,1.420992374420166,0.5331802368164062,0.052564382553100586,0.05535483360290527,0.05371546745300293,0.05440831184387207,0.0552215576171875 diff --git a/results/combined/merges_timed/citysearch/web-widgets.csv b/results/combined/merges_timed/citysearch/web-widgets.csv index 9d21d65d0e..575672c57b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,True,True,True,20,72,660,2,True,20,Tests_passed,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,True,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,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,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,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,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,0abcb7eb9a875b921f56114e18b9b090f4894273fb9cbecfbb5ebcd384d40fc5,Tests_failed,e1f9fb04d61a9fc44fb2dd5ab8c636ff3ac115e5ceb1d6ee311a4c18695fbe8e,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,0.050542354583740234,0.04491305351257324,0.05244874954223633,0.03908395767211914,0.06332540512084961,0.040883541107177734,0.04754066467285156,0.16937041282653809,0.0929725170135498,0.6458954811096191,0.5220749378204346,0.060125112533569336,0.08478403091430664,0.057387590408325195,0.08506155014038086,0.08030152320861816 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,True,True,True,20,72,660,2,True,20,Tests_passed,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,True,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,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,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,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,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,0abcb7eb9a875b921f56114e18b9b090f4894273fb9cbecfbb5ebcd384d40fc5,Tests_failed,e1f9fb04d61a9fc44fb2dd5ab8c636ff3ac115e5ceb1d6ee311a4c18695fbe8e,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,0.050542354583740234,0.04491305351257324,0.05244874954223633,0.03908395767211914,0.06332540512084961,0.040883541107177734,0.04754066467285156,0.16937041282653809,0.0929725170135498,0.6458954811096191,0.5220749378204346,0.060125112533569336,0.08478403091430664,0.057387590408325195,0.08506155014038086,0.08030152320861816,0.07952117919921875,0.07876157760620117,0.08976435661315918,0.09017157554626465,0.08328485488891602,0.0849003791809082,0.08805084228515625,0.12041521072387695,0.10321664810180664,0.6991729736328125,0.5771386623382568,0.08141112327575684,0.07619857788085938,0.07825613021850586,0.07746052742004395,0.0796356201171875 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 663cba89bb..7d84451cae 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -137,refs/heads/develop,5c6c9e155afc295d410d1cc804d79ceb3d3f0027,dca55982f61de5380c281e5be0d48ce18147b2a8,17553059c6ff04d824fb4ff3816a4d83cbf50d98,,True,True,True,47,141,3766,4,True,47,Tests_passed,b8104589f4f845d80fbfb3d2db1bf0046dded477d3c945d0343daca39564756c,True,Tests_passed,a202203a2daa58081baceec344f65adf52ccc8b8eda6a79892d92958c1fffc27,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,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Tests_failed,6c4f4041aaa291b53b7f7ac0d5e8724559f58ab14670d8fa6d613f45b455b4d2,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,e062dac1d655cfde3d48b8fdd36b7584bcd59026eb8204f7f15bc49421915dcf,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,80e2d3104e3c406157067deeeab89b17a4d3d03252b99b531739cd406b5e26e0,Tests_failed,739ba613220539ae72364eda58e15ac1b6174bc8c13e18a0f4a1466f7f99ebdf,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,0.046796321868896484,0.04880094528198242,0.04749250411987305,0.01922130584716797,0.05365252494812012,0.04155421257019043,0.045507192611694336,0.3011176586151123,0.2861349582672119,2.683464527130127,1.1541297435760498,0.07056355476379395,0.07064008712768555,0.08301258087158203,0.09508895874023438,0.09640765190124512 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +137,refs/heads/develop,5c6c9e155afc295d410d1cc804d79ceb3d3f0027,dca55982f61de5380c281e5be0d48ce18147b2a8,17553059c6ff04d824fb4ff3816a4d83cbf50d98,,True,True,True,47,141,3766,4,True,47,Tests_passed,b8104589f4f845d80fbfb3d2db1bf0046dded477d3c945d0343daca39564756c,True,Tests_passed,a202203a2daa58081baceec344f65adf52ccc8b8eda6a79892d92958c1fffc27,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,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Tests_failed,6c4f4041aaa291b53b7f7ac0d5e8724559f58ab14670d8fa6d613f45b455b4d2,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,e062dac1d655cfde3d48b8fdd36b7584bcd59026eb8204f7f15bc49421915dcf,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,80e2d3104e3c406157067deeeab89b17a4d3d03252b99b531739cd406b5e26e0,Tests_failed,739ba613220539ae72364eda58e15ac1b6174bc8c13e18a0f4a1466f7f99ebdf,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,0.046796321868896484,0.04880094528198242,0.04749250411987305,0.01922130584716797,0.05365252494812012,0.04155421257019043,0.045507192611694336,0.3011176586151123,0.2861349582672119,2.683464527130127,1.1541297435760498,0.07056355476379395,0.07064008712768555,0.08301258087158203,0.09508895874023438,0.09640765190124512,0.09589862823486328,0.10121726989746094,0.09555244445800781,0.09244036674499512,0.09093832969665527,0.09110617637634277,0.08524513244628906,0.15479516983032227,0.21129083633422852,3.1784861087799072,1.3085041046142578,0.0963125228881836,0.09247350692749023,0.09169697761535645,0.09657144546508789,0.09623241424560547 diff --git a/results/combined/merges_timed/cjwizard/cjwizard.csv b/results/combined/merges_timed/cjwizard/cjwizard.csv index df9b6c2e21..427fc1dc49 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,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,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,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,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,53641dc18e6e14703fd486825700e97a5516e9c83e00ed31a0548ff5cac61ec8,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.009887456893920898,0.009513378143310547,0.010169506072998047,0.016637086868286133,0.010179519653320312,0.010202407836914062,0.010339975357055664,0.03479361534118652,0.0650787353515625,1.0320379734039307,0.38724708557128906,0.03333139419555664,0.057997703552246094,0.0327296257019043,0.05561256408691406,0.05698537826538086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,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,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,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,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,53641dc18e6e14703fd486825700e97a5516e9c83e00ed31a0548ff5cac61ec8,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.009887456893920898,0.009513378143310547,0.010169506072998047,0.016637086868286133,0.010179519653320312,0.010202407836914062,0.010339975357055664,0.03479361534118652,0.0650787353515625,1.0320379734039307,0.38724708557128906,0.03333139419555664,0.057997703552246094,0.0327296257019043,0.05561256408691406,0.05698537826538086,0.057344913482666016,0.05603671073913574,0.0587007999420166,0.057906389236450195,0.058599233627319336,0.05736207962036133,0.057126760482788086,0.08977580070495605,0.08998489379882812,1.122856855392456,0.41282033920288086,0.056549787521362305,0.056874752044677734,0.058484554290771484,0.057417869567871094,0.05732226371765137 diff --git a/results/combined/merges_timed/clickntap/vimeo.csv b/results/combined/merges_timed/clickntap/vimeo.csv index 00b056e05d..a02773f27a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,True,4,20,70,2,True,4,Tests_passed,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,True,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,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,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,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,875652643809aef95b9f8ac123069379a19fb5dc71befd906288a90dbdd71d25,Tests_failed,b4e2393f1075420569c531e706182d9fd6abd00c1b141e0dddf6207a0f0a3caf,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,0.036110877990722656,0.029940128326416016,0.00931096076965332,0.012399435043334961,0.040049076080322266,0.04227900505065918,0.04246830940246582,0.1423788070678711,0.09981274604797363,1.0457584857940674,0.3973276615142822,0.02870774269104004,0.05350065231323242,0.02897500991821289,0.05295991897583008,0.040680885314941406 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,True,4,20,70,2,True,4,Tests_passed,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,True,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,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,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,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,875652643809aef95b9f8ac123069379a19fb5dc71befd906288a90dbdd71d25,Tests_failed,b4e2393f1075420569c531e706182d9fd6abd00c1b141e0dddf6207a0f0a3caf,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,0.036110877990722656,0.029940128326416016,0.00931096076965332,0.012399435043334961,0.040049076080322266,0.04227900505065918,0.04246830940246582,0.1423788070678711,0.09981274604797363,1.0457584857940674,0.3973276615142822,0.02870774269104004,0.05350065231323242,0.02897500991821289,0.05295991897583008,0.040680885314941406,0.052904605865478516,0.040845394134521484,0.052193641662597656,0.04069209098815918,0.053038835525512695,0.053105831146240234,0.05376696586608887,0.08563017845153809,0.08346867561340332,1.050626516342163,0.4681379795074463,0.05251598358154297,0.051352500915527344,0.053278446197509766,0.05265641212463379,0.041139841079711914 diff --git a/results/combined/merges_timed/clojure/clojure.csv b/results/combined/merges_timed/clojure/clojure.csv index c22a8f91e4..294254e638 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,False,True,4,9,32,2,True,4,Tests_passed,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,True,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027479171752929688,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.11454176902770996,12.79997181892395,1.7908961772918701,0.0462496280670166,0.11142373085021973,0.04617953300476074,0.10603594779968262,0.10473203659057617 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,False,True,4,9,32,2,True,4,Tests_passed,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,True,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027479171752929688,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.11454176902770996,12.79997181892395,1.7908961772918701,0.0462496280670166,0.11142373085021973,0.04617953300476074,0.10603594779968262,0.10473203659057617,0.15645217895507812,0.1341416835784912,0.11457967758178711,0.10346007347106934,0.10336732864379883,0.10249805450439453,0.10974836349487305,0.14458346366882324,0.13868188858032227,12.048134565353394,1.7824556827545166,0.1515505313873291,0.1261613368988037,0.1117558479309082,0.10114741325378418,0.10472583770751953 diff --git a/results/combined/merges_timed/cloudfoundry/cf-java-client.csv b/results/combined/merges_timed/cloudfoundry/cf-java-client.csv index 96cea6686c..ebc5688fb7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -419,refs/heads/main,99db809073a23d10e771abaa23f586c1a53567fc,a69078adc84fd359a85ba12f0ebcc1cd05a87c5c,9acd5fd21c97b62b72e0065eff718a26a25af645,,True,True,True,96,1141,5285.0,2,True,96,Tests_passed,c3fe1cf280f3b0bd65661f90f95fef9f27ea640c1bbd87f90bdfca1f140d769f,True,Tests_passed,0d93d8b9ee70627a42f062cbc58d41844ce3a51f3490cb19396036dcc936551e,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,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,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,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,a77446b8f68ef568d3d8cb4a373e3ebf21866fc61ead0b029c74b106c65e4796,Tests_failed,0de0303ce19081ddbd3f18df46009c0bbd108982dd679d81305350fdab8bb2e6,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,0.030318260192871094,0.02935624122619629,0.038018226623535156,0.05110931396484375,0.03762364387512207,0.03818488121032715,0.038004159927368164,0.07641363143920898,0.08618831634521484,0.606433629989624,2.5804455280303955,0.09105086326599121,0.11124610900878906,0.09110498428344727,0.11359190940856934,0.11596131324768066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +419,refs/heads/main,99db809073a23d10e771abaa23f586c1a53567fc,a69078adc84fd359a85ba12f0ebcc1cd05a87c5c,9acd5fd21c97b62b72e0065eff718a26a25af645,,True,True,True,96,1141,5285.0,2,True,96,Tests_passed,c3fe1cf280f3b0bd65661f90f95fef9f27ea640c1bbd87f90bdfca1f140d769f,True,Tests_passed,0d93d8b9ee70627a42f062cbc58d41844ce3a51f3490cb19396036dcc936551e,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,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,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,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,a77446b8f68ef568d3d8cb4a373e3ebf21866fc61ead0b029c74b106c65e4796,Tests_failed,0de0303ce19081ddbd3f18df46009c0bbd108982dd679d81305350fdab8bb2e6,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,0.030318260192871094,0.02935624122619629,0.038018226623535156,0.05110931396484375,0.03762364387512207,0.03818488121032715,0.038004159927368164,0.07641363143920898,0.08618831634521484,0.606433629989624,2.5804455280303955,0.09105086326599121,0.11124610900878906,0.09110498428344727,0.11359190940856934,0.11596131324768066,0.1077885627746582,0.1088414192199707,0.11426568031311035,0.11716651916503906,0.11307859420776367,0.11682558059692383,0.11704325675964355,0.16655230522155762,0.1450185775756836,0.7117080688476562,2.7318739891052246,0.10827469825744629,0.10510039329528809,0.10621142387390137,0.11118674278259277,0.1076505184173584 diff --git a/results/combined/merges_timed/cloudslab/cloudsim.csv b/results/combined/merges_timed/cloudslab/cloudsim.csv index e7be5b2f4e..9ad105aaee 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,True,6,16,33,8,True,8,Tests_passed,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,True,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,True,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,ff7f9960b0649308b3876d513052bb8925e676b0dc8ae12fae7ebccedad06fd2,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,df5345d49fd3c5cbcb2a021076ea7ee32c7758aacc666ed363d714c6a6275b09,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Tests_passed,ea4fb2e36895b349bf1f8c87c5b690f0b11350d3cdcb96c1560ce00a4fed0150,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,0.057253360748291016,0.07322835922241211,0.0879828929901123,0.05249142646789551,0.08467674255371094,0.07996273040771484,0.09543371200561523,0.430753231048584,0.4353199005126953,2.5534117221832275,0.5896320343017578,0.11669659614562988,0.11953210830688477,0.11830401420593262,0.11634254455566406,0.12217235565185547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,True,6,16,33,8,True,8,Tests_passed,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,True,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,True,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,ff7f9960b0649308b3876d513052bb8925e676b0dc8ae12fae7ebccedad06fd2,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,df5345d49fd3c5cbcb2a021076ea7ee32c7758aacc666ed363d714c6a6275b09,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Tests_passed,ea4fb2e36895b349bf1f8c87c5b690f0b11350d3cdcb96c1560ce00a4fed0150,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,0.057253360748291016,0.07322835922241211,0.0879828929901123,0.05249142646789551,0.08467674255371094,0.07996273040771484,0.09543371200561523,0.430753231048584,0.4353199005126953,2.5534117221832275,0.5896320343017578,0.11669659614562988,0.11953210830688477,0.11830401420593262,0.11634254455566406,0.12217235565185547,0.1210329532623291,0.12311220169067383,0.12893080711364746,0.12733030319213867,0.12505483627319336,0.1284475326538086,0.12663769721984863,0.24956655502319336,0.2852954864501953,2.6528451442718506,0.722883939743042,0.11986374855041504,0.11980414390563965,0.12042593955993652,0.11946415901184082,0.12029290199279785 diff --git a/results/combined/merges_timed/cloudslang/score.csv b/results/combined/merges_timed/cloudslang/score.csv index 252db27925..cf88d2bd9f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -415,refs/remotes/origin/ScoreWorkerMonitor,bfe7c0dad895f1f0fdfbdab5611568a717cab295,c4f3b87e475e3c87d2275a956a3d65e2b04f647a,640eab6d0c491a4c96e04b604d4ff14f34c688f4,,True,True,Tests_passed,e29a46423a25d1ee59e8135f3d5b6a65264987a0b97fb27fda0dbe27ad315226,True,54,93,911,3,True,Tests_passed,43429ee4c9c8115a2e5564a3951d14ce7aa7461efc0a53304d7c49bb24de29fb,True,54,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,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,ea24bc2b0fa89f4e9f81bfc5465f3104973f78297200cba36e658d95cbdd6a19,Merge_failed,fce859bf34e6c6a5047241f1fca0fb0bf29c38c7464855b1d7296b28659412f3,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Tests_failed,a109cd892acc3f6620c1345a791f39fa68fe489f145fba245b4241fe6f4999e2,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,0.06289005279541016,0.04931378364562988,0.053435564041137695,0.023448467254638672,0.06134819984436035,0.05550265312194824,0.06338930130004883,0.24293828010559082,0.189605712890625,0.04369354248046875,0.45642852783203125,0.06180596351623535,0.06402850151062012,0.06623387336730957,0.06725144386291504,0.06335091590881348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +415,refs/remotes/origin/ScoreWorkerMonitor,bfe7c0dad895f1f0fdfbdab5611568a717cab295,c4f3b87e475e3c87d2275a956a3d65e2b04f647a,640eab6d0c491a4c96e04b604d4ff14f34c688f4,,True,True,Tests_passed,e29a46423a25d1ee59e8135f3d5b6a65264987a0b97fb27fda0dbe27ad315226,True,54,93,911,3,True,Tests_passed,43429ee4c9c8115a2e5564a3951d14ce7aa7461efc0a53304d7c49bb24de29fb,True,54,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,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,ea24bc2b0fa89f4e9f81bfc5465f3104973f78297200cba36e658d95cbdd6a19,Merge_failed,fce859bf34e6c6a5047241f1fca0fb0bf29c38c7464855b1d7296b28659412f3,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Tests_failed,a109cd892acc3f6620c1345a791f39fa68fe489f145fba245b4241fe6f4999e2,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,19fa252dbc4eed06a6589686ad53160cb848ef24681281031ad9c4cc171b28ef,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,0.06289005279541016,0.04931378364562988,0.053435564041137695,0.023448467254638672,0.06134819984436035,0.05550265312194824,0.06338930130004883,0.24293828010559082,0.189605712890625,0.04369354248046875,0.45642852783203125,0.06180596351623535,0.06402850151062012,0.06623387336730957,0.06725144386291504,0.06335091590881348,0.06614542007446289,0.06631159782409668,0.06632065773010254,0.06360530853271484,0.0693812370300293,0.06673789024353027,0.06908535957336426,0.12231183052062988,0.13389897346496582,0.08208107948303223,0.5557529926300049,0.07049798965454102,0.06645655632019043,0.06444191932678223,0.06852579116821289,0.06531500816345215 diff --git a/results/combined/merges_timed/clusterbench/clusterbench.csv b/results/combined/merges_timed/clusterbench/clusterbench.csv index b72ea793fa..0ad6c0af3b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,Tests_passed,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,True,14,38,145,2,True,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,True,14,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_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,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,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,0.037717580795288086,0.03677058219909668,0.07264566421508789,0.025244951248168945,0.047582149505615234,0.07420158386230469,0.06534719467163086,0.17192959785461426,0.1217508316040039,0.04115557670593262,0.3108100891113281,0.04656577110290527,0.06587910652160645,0.04895496368408203,0.07325530052185059,0.07331299781799316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,Tests_passed,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,True,14,38,145,2,True,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,True,14,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_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,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,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,0.037717580795288086,0.03677058219909668,0.07264566421508789,0.025244951248168945,0.047582149505615234,0.07420158386230469,0.06534719467163086,0.17192959785461426,0.1217508316040039,0.04115557670593262,0.3108100891113281,0.04656577110290527,0.06587910652160645,0.04895496368408203,0.07325530052185059,0.07331299781799316,0.07248353958129883,0.06597208976745605,0.07403182983398438,0.07330989837646484,0.07605624198913574,0.0760045051574707,0.07432746887207031,0.11216187477111816,0.10609865188598633,0.08259296417236328,0.3403739929199219,0.07230401039123535,0.07050108909606934,0.06298279762268066,0.07095170021057129,0.06999945640563965 diff --git a/results/combined/merges_timed/code4craft/termblog.csv b/results/combined/merges_timed/code4craft/termblog.csv index 7f146eecc7..32cc24d75f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,Tests_passed,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,True,115,33,3910,4,True,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,True,115,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,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,530e3eb5fa63c2c6f5aa6258bf54ba3b9bea73227547a18175e5c943e61a5de9,Merge_failed,128adcdba5e25fe0c09099f6f4568ddd4e6523cf1ad5a2680b5b75662109e0d6,Merge_failed,cb0a83b3b27d05484e0e5c963c7e7d3e3ef01af8ae483d51c39812dd865e3e52,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,0.04150962829589844,0.049869537353515625,0.05292534828186035,0.01822042465209961,0.047705650329589844,0.04695439338684082,0.03488302230834961,0.26352834701538086,0.22367358207702637,1.1094958782196045,0.27344274520874023,0.06297731399536133,0.0644690990447998,0.06560492515563965,0.07393741607666016,0.07571172714233398 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,Tests_passed,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,True,115,33,3910,4,True,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,True,115,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,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,530e3eb5fa63c2c6f5aa6258bf54ba3b9bea73227547a18175e5c943e61a5de9,Merge_failed,128adcdba5e25fe0c09099f6f4568ddd4e6523cf1ad5a2680b5b75662109e0d6,Merge_failed,cb0a83b3b27d05484e0e5c963c7e7d3e3ef01af8ae483d51c39812dd865e3e52,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,Merge_failed,353d4504fde89b1bc15779e04b407fdb0c9140af8286bc78397d71d11be1fe47,0.04150962829589844,0.049869537353515625,0.05292534828186035,0.01822042465209961,0.047705650329589844,0.04695439338684082,0.03488302230834961,0.26352834701538086,0.22367358207702637,1.1094958782196045,0.27344274520874023,0.06297731399536133,0.0644690990447998,0.06560492515563965,0.07393741607666016,0.07571172714233398,0.07497811317443848,0.07346439361572266,0.0753486156463623,0.07504892349243164,0.0746462345123291,0.07537317276000977,0.07479023933410645,0.1387925148010254,0.16080451011657715,1.296544075012207,0.3626689910888672,0.07439422607421875,0.07498049736022949,0.07710003852844238,0.07382678985595703,0.07306432723999023 diff --git a/results/combined/merges_timed/code4craft/webmagic.csv b/results/combined/merges_timed/code4craft/webmagic.csv index e8aa9ee389..4ab91aa39f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,69,89,2060,44,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,96,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,4b49b92ff87b75a2603e42ccd546771ed4d0ed60053914c54ead08418b3bb777,Merge_failed,de2b95006378fcdc5e6473fd59b0df902ea7744db64673776e5e2e1e9b85df7b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,0b4b3b330b1ef9e8f28c7de8b60be1e32cf3f275cab9f9533d3331fc664ba130,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,656a5c08a73a9f9087259213c332052984963c560b49f43d5d1eda9fc6e65357,Merge_failed,dc61dcc94a6c8e6308836836151d81eb2226af70b58d68a045c1913ba267750b,Merge_failed,06a53d89d1abecdd97aa3eed8dd1dbd3676e45a41e0014c8333e52cf8b6a7814,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.05736041069030762,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.7516984939575195,4.715071201324463,1.5783095359802246,0.2258150577545166,0.3066110610961914,0.22974061965942383,0.32364559173583984,0.31694889068603516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,69,89,2060,44,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,96,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,4b49b92ff87b75a2603e42ccd546771ed4d0ed60053914c54ead08418b3bb777,Merge_failed,de2b95006378fcdc5e6473fd59b0df902ea7744db64673776e5e2e1e9b85df7b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,0b4b3b330b1ef9e8f28c7de8b60be1e32cf3f275cab9f9533d3331fc664ba130,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,656a5c08a73a9f9087259213c332052984963c560b49f43d5d1eda9fc6e65357,Merge_failed,dc61dcc94a6c8e6308836836151d81eb2226af70b58d68a045c1913ba267750b,Merge_failed,06a53d89d1abecdd97aa3eed8dd1dbd3676e45a41e0014c8333e52cf8b6a7814,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,fd61d06d0e06c073c505ffc5fd26dd1ce408a5a15589ee86995f632a2c28fed0,Merge_failed,a3a1865000b75ad444c6682ccaf6703d0e57f591319fd11a49f6ac6f0ca5a0e6,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.05736041069030762,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.7516984939575195,4.715071201324463,1.5783095359802246,0.2258150577545166,0.3066110610961914,0.22974061965942383,0.32364559173583984,0.31694889068603516,0.3012986183166504,0.2971677780151367,0.3096888065338135,0.29135727882385254,0.2985036373138428,0.2988715171813965,0.29931068420410156,0.5693173408508301,0.6227142810821533,4.809096574783325,1.621751308441162,0.29956579208374023,0.2925291061401367,0.2873671054840088,0.26559972763061523,0.30521416664123535 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 92938b33af..47757acd91 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,True,True,Tests_passed,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,True,4,23,257,2,True,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,True,4,True,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,aa98e31a0193594abc09ad8431adc9bd9d875b782f3deb0318c620d8bd8c0869,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,4915659646700139f28798e665a4621c04d31baeadcb8fa8ab8a32e8e0dddd70,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Tests_failed,36551660d49a5c87a3874b848a4a70e7203ebc222f2e5b4ec09d86d757090fee,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,0.03888297080993652,0.03575253486633301,0.03396010398864746,0.01301121711730957,0.036795616149902344,0.03799915313720703,0.036849260330200195,0.16554021835327148,0.11408233642578125,0.8081326484680176,0.287020206451416,0.039313554763793945,0.03978466987609863,0.06033778190612793,0.08873796463012695,0.05002546310424805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,True,True,Tests_passed,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,True,4,23,257,2,True,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,True,4,True,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,aa98e31a0193594abc09ad8431adc9bd9d875b782f3deb0318c620d8bd8c0869,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,4915659646700139f28798e665a4621c04d31baeadcb8fa8ab8a32e8e0dddd70,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Tests_failed,36551660d49a5c87a3874b848a4a70e7203ebc222f2e5b4ec09d86d757090fee,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,0.03888297080993652,0.03575253486633301,0.03396010398864746,0.01301121711730957,0.036795616149902344,0.03799915313720703,0.036849260330200195,0.16554021835327148,0.11408233642578125,0.8081326484680176,0.287020206451416,0.039313554763793945,0.03978466987609863,0.06033778190612793,0.08873796463012695,0.05002546310424805,0.08755683898925781,0.04957318305969238,0.09084963798522949,0.05170893669128418,0.0895853042602539,0.08821654319763184,0.08822154998779297,0.12221646308898926,0.12798023223876953,0.9827051162719727,0.34117650985717773,0.09108877182006836,0.09027862548828125,0.09026026725769043,0.08996844291687012,0.04848766326904297 diff --git a/results/combined/merges_timed/codedance/silken.csv b/results/combined/merges_timed/codedance/silken.csv index 3027887958..d96ed58440 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,True,True,Tests_passed,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,True,15,84,493,3,True,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,True,15,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,e1aeebbd5d0be941701f43fc6c55812644b6b15e59a87a16da95941417caa7ad,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,01ef5ef998caa282cd523734a84e54273d05c66eb836e5427b4fba8e585dd17f,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b2d9e66af8d576ae94a31ceeeae3fabe61e606d4329972df2f379d6e03f93b51,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,c22abdbbd53f5f436c8d0e5ad974b1a18b885c421f8bc223ad18a59d58cec334,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,0.00909423828125,0.009138345718383789,0.008937597274780273,0.014751434326171875,0.008910179138183594,0.008941411972045898,0.009038925170898438,0.04394125938415527,0.12319493293762207,1.6382012367248535,0.44411325454711914,0.055518150329589844,0.05428481101989746,0.05251026153564453,0.05581164360046387,0.055837154388427734 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,True,True,Tests_passed,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,True,15,84,493,3,True,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,True,15,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,e1aeebbd5d0be941701f43fc6c55812644b6b15e59a87a16da95941417caa7ad,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,01ef5ef998caa282cd523734a84e54273d05c66eb836e5427b4fba8e585dd17f,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b2d9e66af8d576ae94a31ceeeae3fabe61e606d4329972df2f379d6e03f93b51,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,c22abdbbd53f5f436c8d0e5ad974b1a18b885c421f8bc223ad18a59d58cec334,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,0.00909423828125,0.009138345718383789,0.008937597274780273,0.014751434326171875,0.008910179138183594,0.008941411972045898,0.009038925170898438,0.04394125938415527,0.12319493293762207,1.6382012367248535,0.44411325454711914,0.055518150329589844,0.05428481101989746,0.05251026153564453,0.05581164360046387,0.055837154388427734,0.05252242088317871,0.05383467674255371,0.05481123924255371,0.054036617279052734,0.052942514419555664,0.05305647850036621,0.05267834663391113,0.10001707077026367,0.12617015838623047,1.700582504272461,0.500086784362793,0.053481340408325195,0.05437040328979492,0.05445456504821777,0.05300259590148926,0.0537567138671875 diff --git a/results/combined/merges_timed/codeine-cd/codeine.csv b/results/combined/merges_timed/codeine-cd/codeine.csv index b14aec6ca5..e448a54dcc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,True,12,32,903.0,2,True,12,Tests_passed,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,True,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,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,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,bd70463af3cf804228bd0dd3251f9239c01ea22c10eb93530fc0e8964bcdf48c,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,3b1ee6619c1dd2c474dc1f6422d350e1b8e58b79bc4a694264b1f7e8b982b212,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,0.03825116157531738,0.03835892677307129,0.040407657623291016,0.01767730712890625,0.03997373580932617,0.038826942443847656,0.04228067398071289,0.2515859603881836,0.12093830108642578,0.9364640712738037,0.5792844295501709,0.042986392974853516,0.043660640716552734,0.04323554039001465,0.04454922676086426,0.046121835708618164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,True,12,32,903.0,2,True,12,Tests_passed,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,True,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,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,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,bd70463af3cf804228bd0dd3251f9239c01ea22c10eb93530fc0e8964bcdf48c,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,3b1ee6619c1dd2c474dc1f6422d350e1b8e58b79bc4a694264b1f7e8b982b212,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,0.03825116157531738,0.03835892677307129,0.040407657623291016,0.01767730712890625,0.03997373580932617,0.038826942443847656,0.04228067398071289,0.2515859603881836,0.12093830108642578,0.9364640712738037,0.5792844295501709,0.042986392974853516,0.043660640716552734,0.04323554039001465,0.04454922676086426,0.046121835708618164,0.045349836349487305,0.04530024528503418,0.045148611068725586,0.04573774337768555,0.045661211013793945,0.04639267921447754,0.04577016830444336,0.07990169525146484,0.08498811721801758,1.096517562866211,0.6978869438171387,0.04605746269226074,0.045362234115600586,0.04530000686645508,0.04545426368713379,0.04510641098022461 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv b/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv index 33553220b1..5122695fa6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,True,4,33,97,8,True,9,Tests_passed,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,True,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,True,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,77217716027282e8123a61f8a68e13998a075afba453da9a7143ff35e7d77f4f,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,a9916e28674eb1ae022d75c232215d180fba33ff27305adf0e01cefa7b6dfd01,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,0.04054689407348633,0.04616904258728027,0.03885316848754883,0.015351295471191406,0.04768061637878418,0.04771780967712402,0.046418190002441406,0.24273037910461426,0.17908692359924316,2.5766348838806152,0.41704511642456055,0.0480656623840332,0.04940223693847656,0.04821038246154785,0.050124168395996094,0.04958057403564453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,True,4,33,97,8,True,9,Tests_passed,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,True,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,True,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,77217716027282e8123a61f8a68e13998a075afba453da9a7143ff35e7d77f4f,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,a9916e28674eb1ae022d75c232215d180fba33ff27305adf0e01cefa7b6dfd01,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,0.04054689407348633,0.04616904258728027,0.03885316848754883,0.015351295471191406,0.04768061637878418,0.04771780967712402,0.046418190002441406,0.24273037910461426,0.17908692359924316,2.5766348838806152,0.41704511642456055,0.0480656623840332,0.04940223693847656,0.04821038246154785,0.050124168395996094,0.04958057403564453,0.04889798164367676,0.05069875717163086,0.049440860748291016,0.04964733123779297,0.04963111877441406,0.05072927474975586,0.048133134841918945,0.0997471809387207,0.11383581161499023,2.801941394805908,0.5100555419921875,0.048284053802490234,0.04987955093383789,0.04885411262512207,0.04941511154174805,0.05019235610961914 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv b/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv index 3c40238d94..c8e93ec5a1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,True,False,Tests_passed,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,True,5,10,130,2,True,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,True,5,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,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,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,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,7ba11bcd3cf3553ed50a5a0ea5ad2c368453259f4e9a64039d8d9bebec1bf843,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,0.04557633399963379,0.04357576370239258,0.04945206642150879,0.016089677810668945,0.032483816146850586,0.04746532440185547,0.04197216033935547,0.16209840774536133,0.11468172073364258,1.81307053565979,0.450056791305542,0.03282022476196289,0.06041741371154785,0.03224587440490723,0.059072017669677734,0.06152510643005371 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,True,False,Tests_passed,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,True,5,10,130,2,True,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,True,5,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,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,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,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,7ba11bcd3cf3553ed50a5a0ea5ad2c368453259f4e9a64039d8d9bebec1bf843,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,0.04557633399963379,0.04357576370239258,0.04945206642150879,0.016089677810668945,0.032483816146850586,0.04746532440185547,0.04197216033935547,0.16209840774536133,0.11468172073364258,1.81307053565979,0.450056791305542,0.03282022476196289,0.06041741371154785,0.03224587440490723,0.059072017669677734,0.06152510643005371,0.06155514717102051,0.058531761169433594,0.06144523620605469,0.06228184700012207,0.06107950210571289,0.06113076210021973,0.061608076095581055,0.09413528442382812,0.09415102005004883,1.8752164840698242,0.505852460861206,0.06010031700134277,0.0626528263092041,0.06006622314453125,0.06228208541870117,0.061264991760253906 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv b/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv index bbab82c67f..f8ea3ce18f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,True,True,Tests_passed,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,True,5,19,126,5,True,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,True,7,True,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,13984e7942474b392a10e7675ee4dabcb552ec531d0320ae8df3ba4e98509792,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Tests_failed,e85f61c02255f31557e6788bb5815e22a018b752400fc412e55e9033cbda71e1,Merge_failed,e5d45d03a56964eba6f34f217e7e90a4a1c728393ae7970d04b77d334069b69c,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,e36b79688be8dbb510a6f83532f0f5009e68cd68671839ace16988571439ec45,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,4a288e68760c57f6b42f5f19ee7f01480d44a11cc2f4d969a00339806e8e834e,Tests_failed,c737fbf7c8a6b845c15e954e53d31d1c9c96ab9ee0e13e190178a9fff701f254,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,0.043357133865356445,0.04159688949584961,0.039713144302368164,0.013731002807617188,0.04236721992492676,0.04009199142456055,0.040122270584106445,0.22452092170715332,0.19608473777770996,1.5984892845153809,0.6519522666931152,0.05398440361022949,0.05429267883300781,0.052259206771850586,0.06137204170227051,0.06052350997924805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,True,True,Tests_passed,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,True,5,19,126,5,True,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,True,7,True,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,13984e7942474b392a10e7675ee4dabcb552ec531d0320ae8df3ba4e98509792,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Tests_failed,e85f61c02255f31557e6788bb5815e22a018b752400fc412e55e9033cbda71e1,Merge_failed,e5d45d03a56964eba6f34f217e7e90a4a1c728393ae7970d04b77d334069b69c,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,e36b79688be8dbb510a6f83532f0f5009e68cd68671839ace16988571439ec45,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,4a288e68760c57f6b42f5f19ee7f01480d44a11cc2f4d969a00339806e8e834e,Tests_failed,c737fbf7c8a6b845c15e954e53d31d1c9c96ab9ee0e13e190178a9fff701f254,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,Merge_failed,be38ef347d0b0087a0df2b2e480d6f9d10631823ce0a7fc423db820627169596,0.043357133865356445,0.04159688949584961,0.039713144302368164,0.013731002807617188,0.04236721992492676,0.04009199142456055,0.040122270584106445,0.22452092170715332,0.19608473777770996,1.5984892845153809,0.6519522666931152,0.05398440361022949,0.05429267883300781,0.052259206771850586,0.06137204170227051,0.06052350997924805,0.06102752685546875,0.05998086929321289,0.06058144569396973,0.06060624122619629,0.059504032135009766,0.0604400634765625,0.06223034858703613,0.10726737976074219,0.14783835411071777,1.855210542678833,0.7766790390014648,0.06165313720703125,0.062233924865722656,0.06135892868041992,0.06142401695251465,0.06047987937927246 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 175fbccd82..babfe90961 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,True,15,36,229,2,True,15,Tests_passed,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,True,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,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_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,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,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,0.010289192199707031,0.010288476943969727,0.011412382125854492,0.019262313842773438,0.01153421401977539,0.011619806289672852,0.011581659317016602,0.03693222999572754,0.06628584861755371,0.013889551162719727,0.30578064918518066,0.03851604461669922,0.06165122985839844,0.03710198402404785,0.06132936477661133,0.061391592025756836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,True,15,36,229,2,True,15,Tests_passed,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,True,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,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_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,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,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,0.010289192199707031,0.010288476943969727,0.011412382125854492,0.019262313842773438,0.01153421401977539,0.011619806289672852,0.011581659317016602,0.03693222999572754,0.06628584861755371,0.013889551162719727,0.30578064918518066,0.03851604461669922,0.06165122985839844,0.03710198402404785,0.06132936477661133,0.061391592025756836,0.06113767623901367,0.06145358085632324,0.06187939643859863,0.06295013427734375,0.06234622001647949,0.0608983039855957,0.06089615821838379,0.09768867492675781,0.09427189826965332,0.0742034912109375,0.3601360321044922,0.05995678901672363,0.06118321418762207,0.06033897399902344,0.059715986251831055,0.05993986129760742 diff --git a/results/combined/merges_timed/cognifide/sling-dynamic-include.csv b/results/combined/merges_timed/cognifide/sling-dynamic-include.csv index 6ac9933e9b..bf12374745 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,True,20,34,891,3,True,20,Tests_passed,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,True,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,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,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,0.010549783706665039,0.011467695236206055,0.013290166854858398,0.013828277587890625,0.012944459915161133,0.010731935501098633,0.010038375854492188,0.05205345153808594,0.0701298713684082,0.025482177734375,-1.0,0.0348052978515625,0.05619049072265625,0.034757137298583984,0.05601930618286133,0.05642843246459961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,True,20,34,891,3,True,20,Tests_passed,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,True,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,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,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,0.010549783706665039,0.011467695236206055,0.013290166854858398,0.013828277587890625,0.012944459915161133,0.010731935501098633,0.010038375854492188,0.05205345153808594,0.0701298713684082,0.025482177734375,-1.0,0.0348052978515625,0.05619049072265625,0.034757137298583984,0.05601930618286133,0.05642843246459961,0.05354046821594238,0.056001901626586914,0.05423378944396973,0.054207563400268555,0.055536508560180664,0.05487227439880371,0.05572319030761719,0.09598088264465332,0.0853419303894043,0.06641888618469238,-1.0,0.05578351020812988,0.053865909576416016,0.05511808395385742,0.05407118797302246,0.054720163345336914 diff --git a/results/combined/merges_timed/cognitect-labs/transducers-java.csv b/results/combined/merges_timed/cognitect-labs/transducers-java.csv index 27e2bc7136..da80878544 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,True,18,17,1859,3,True,18,Tests_passed,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,True,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,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,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,0.04203534126281738,0.04046988487243652,0.03931903839111328,0.013082027435302734,0.037323713302612305,0.03833127021789551,0.037595272064208984,0.15863680839538574,0.03843331336975098,0.044553279876708984,3.780498743057251,0.042212486267089844,0.04377269744873047,0.04228806495666504,0.043294668197631836,0.04247856140136719 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,True,18,17,1859,3,True,18,Tests_passed,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,True,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,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,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,0.04203534126281738,0.04046988487243652,0.03931903839111328,0.013082027435302734,0.037323713302612305,0.03833127021789551,0.037595272064208984,0.15863680839538574,0.03843331336975098,0.044553279876708984,3.780498743057251,0.042212486267089844,0.04377269744873047,0.04228806495666504,0.043294668197631836,0.04247856140136719,0.04331183433532715,0.043028831481933594,0.04274129867553711,0.04283285140991211,0.04255557060241699,0.04273366928100586,0.04259657859802246,0.07733917236328125,0.05113077163696289,0.05690193176269531,4.012819290161133,0.04363441467285156,0.04263710975646973,0.04249691963195801,0.04385709762573242,0.043541669845581055 diff --git a/results/combined/merges_timed/cognitect/transit-java.csv b/results/combined/merges_timed/cognitect/transit-java.csv index 6bb4679c3e..35fa0acb8e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,True,18,64,429,3,True,18,Tests_passed,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,True,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,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,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,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,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,5c8a7b012729aca88e6e56748b8407f8b3fc03161327be681684678ba7acec1f,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,0.042586326599121094,0.04252457618713379,0.043727874755859375,0.018285751342773438,0.05334830284118652,0.04994511604309082,0.05172443389892578,0.2388594150543213,0.16956567764282227,1.7480864524841309,0.6849625110626221,0.035401105880737305,0.07739520072937012,0.03565049171447754,0.0776212215423584,0.07908201217651367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,True,18,64,429,3,True,18,Tests_passed,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,True,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,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,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,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,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,5c8a7b012729aca88e6e56748b8407f8b3fc03161327be681684678ba7acec1f,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,0.042586326599121094,0.04252457618713379,0.043727874755859375,0.018285751342773438,0.05334830284118652,0.04994511604309082,0.05172443389892578,0.2388594150543213,0.16956567764282227,1.7480864524841309,0.6849625110626221,0.035401105880737305,0.07739520072937012,0.03565049171447754,0.0776212215423584,0.07908201217651367,0.07787680625915527,0.07984542846679688,0.08059525489807129,0.07743978500366211,0.08092451095581055,0.08059239387512207,0.08007526397705078,0.13211941719055176,0.13361549377441406,1.968968391418457,0.7791824340820312,0.07849001884460449,0.07840752601623535,0.08005189895629883,0.08041071891784668,0.07856345176696777 diff --git a/results/combined/merges_timed/comatoes/ftl-profile-editor.csv b/results/combined/merges_timed/comatoes/ftl-profile-editor.csv index 45c8fdb55f..333a432463 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,True,True,True,6,68,825,2,True,6,Tests_passed,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,True,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,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,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,Tests_failed,1d7bac0fd16c079a7a1451c1675d31f46ce997292c1c86bb30eea8442a287f87,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,77f63b09e400f9c6fa01dc5d7e5fd656b24700c4705af279e95c01b9da910dfb,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Tests_failed,f2eab3112eafcf248901175f9a39f49cf6d26fa7bf36cfa1c7f9bede9ddef710,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,0.010855674743652344,0.011154890060424805,0.01185154914855957,0.015549182891845703,0.011424541473388672,0.011464834213256836,0.010877609252929688,0.04105949401855469,0.07241702079772949,2.098428726196289,0.6190495491027832,0.05270743370056152,0.04412555694580078,0.04484295845031738,0.04668116569519043,0.04526996612548828 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,True,True,True,6,68,825,2,True,6,Tests_passed,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,True,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,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,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,Tests_failed,1d7bac0fd16c079a7a1451c1675d31f46ce997292c1c86bb30eea8442a287f87,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,77f63b09e400f9c6fa01dc5d7e5fd656b24700c4705af279e95c01b9da910dfb,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Tests_failed,f2eab3112eafcf248901175f9a39f49cf6d26fa7bf36cfa1c7f9bede9ddef710,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,0.010855674743652344,0.011154890060424805,0.01185154914855957,0.015549182891845703,0.011424541473388672,0.011464834213256836,0.010877609252929688,0.04105949401855469,0.07241702079772949,2.098428726196289,0.6190495491027832,0.05270743370056152,0.04412555694580078,0.04484295845031738,0.04668116569519043,0.04526996612548828,0.04634356498718262,0.04314708709716797,0.04521608352661133,0.04375338554382324,0.04635477066040039,0.04430365562438965,0.044953346252441406,0.07616829872131348,0.08006763458251953,1.8031964302062988,0.6953561305999756,0.04753541946411133,0.04488730430603027,0.04803156852722168,0.046449899673461914,0.043277740478515625 diff --git a/results/combined/merges_timed/comcast/jrugged.csv b/results/combined/merges_timed/comcast/jrugged.csv index 18c61894cf..d9137320eb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,False,True,3,3,5,2,True,3,Tests_passed,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,True,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,True,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,b6aa9ae8a5303a16d651c4e67e3366a5a3fae98ac9b0a954bbafdc778a6e0fb7,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Tests_failed,8e3b8f5be243eb74e2b455e6b7b0cb5f57dc53433b114c5ee44eb9129f1b763e,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,c8187f41476bc3927fe3cd621dce903ad56e36302d67f35c32d169f1eea18153,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,72f965eca2869e358d865246f056318f8fe0003322dc183fa91c84fa8dfa34f7,Tests_failed,6ec09d759011b472f145e179bbb9fca48d88e22b90bd1d4186c62de6b076ee2f,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,0.043529510498046875,0.04539823532104492,0.04171252250671387,0.016619205474853516,0.042873382568359375,0.047979116439819336,0.04828333854675293,0.17359447479248047,0.1260390281677246,0.938474178314209,0.33376049995422363,0.04228353500366211,0.04391956329345703,0.04247260093688965,0.0442657470703125,0.04386401176452637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,False,True,3,3,5,2,True,3,Tests_passed,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,True,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,True,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,b6aa9ae8a5303a16d651c4e67e3366a5a3fae98ac9b0a954bbafdc778a6e0fb7,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Tests_failed,8e3b8f5be243eb74e2b455e6b7b0cb5f57dc53433b114c5ee44eb9129f1b763e,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,c8187f41476bc3927fe3cd621dce903ad56e36302d67f35c32d169f1eea18153,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,72f965eca2869e358d865246f056318f8fe0003322dc183fa91c84fa8dfa34f7,Tests_failed,6ec09d759011b472f145e179bbb9fca48d88e22b90bd1d4186c62de6b076ee2f,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,0.043529510498046875,0.04539823532104492,0.04171252250671387,0.016619205474853516,0.042873382568359375,0.047979116439819336,0.04828333854675293,0.17359447479248047,0.1260390281677246,0.938474178314209,0.33376049995422363,0.04228353500366211,0.04391956329345703,0.04247260093688965,0.0442657470703125,0.04386401176452637,0.043096303939819336,0.040522098541259766,0.04308342933654785,0.04303860664367676,0.042327165603637695,0.042890310287475586,0.04132366180419922,0.07513093948364258,0.0785071849822998,1.0138695240020752,0.40572285652160645,0.042804718017578125,0.04318380355834961,0.042266130447387695,0.041993141174316406,0.04244065284729004 diff --git a/results/combined/merges_timed/commons-rdf/commons-rdf.csv b/results/combined/merges_timed/commons-rdf/commons-rdf.csv index 861e955c59..62fdd65b9b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,True,True,True,11,25,488,3,True,11,Tests_passed,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,True,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,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,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Merge_failed,75a1038aa3ce95635bca451372cd28125b4dc63ca3ba4e0754430b4e1c7827d7,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,fd79a5194f3b63d37b189785691749afecd8fc4db223bc6620dc393cce699a36,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,4a4b644b5da003cb748989e4dd2e8b07a74887e2ae543da8674e8a69d1cea41d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,0.04026532173156738,0.0465090274810791,0.0353550910949707,0.014694690704345703,0.03623199462890625,0.0364222526550293,0.0369105339050293,0.13366413116455078,0.16765642166137695,0.4779548645019531,0.24250245094299316,0.03981733322143555,0.05933094024658203,0.04020524024963379,0.0639188289642334,0.07224893569946289 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,True,True,True,11,25,488,3,True,11,Tests_passed,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,True,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,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,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Merge_failed,75a1038aa3ce95635bca451372cd28125b4dc63ca3ba4e0754430b4e1c7827d7,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,fd79a5194f3b63d37b189785691749afecd8fc4db223bc6620dc393cce699a36,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,4a4b644b5da003cb748989e4dd2e8b07a74887e2ae543da8674e8a69d1cea41d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,0.04026532173156738,0.0465090274810791,0.0353550910949707,0.014694690704345703,0.03623199462890625,0.0364222526550293,0.0369105339050293,0.13366413116455078,0.16765642166137695,0.4779548645019531,0.24250245094299316,0.03981733322143555,0.05933094024658203,0.04020524024963379,0.0639188289642334,0.07224893569946289,0.06345868110656738,0.07182788848876953,0.06458377838134766,0.07272696495056152,0.06411004066467285,0.06260848045349121,0.06185412406921387,0.11257362365722656,0.12789702415466309,0.5591292381286621,0.30874037742614746,0.06327462196350098,0.06277704238891602,0.061820268630981445,0.06346797943115234,0.07197976112365723 diff --git a/results/combined/merges_timed/connorlinfoot/cratesplus.csv b/results/combined/merges_timed/connorlinfoot/cratesplus.csv index c924c392f3..2d74835d95 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,True,True,Tests_passed,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,True,19,75,374,3,True,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,True,19,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,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,62b0bf40fc6d399a846507aa7eff3749dd579d1b742c5ab252e14fa594052254,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,a3bfe798363233952d28b2f26c45378c5a23d3dbe5c012ed7a537f5490604a95,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,0.009582996368408203,0.009786605834960938,0.01015472412109375,0.016145706176757812,0.009912729263305664,0.010360002517700195,0.01027369499206543,0.04749417304992676,0.12041687965393066,0.4206259250640869,0.554124116897583,0.0392763614654541,0.059766292572021484,0.04034829139709473,0.06092262268066406,0.06071805953979492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,True,True,Tests_passed,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,True,19,75,374,3,True,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,True,19,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,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,62b0bf40fc6d399a846507aa7eff3749dd579d1b742c5ab252e14fa594052254,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,a3bfe798363233952d28b2f26c45378c5a23d3dbe5c012ed7a537f5490604a95,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,0.009582996368408203,0.009786605834960938,0.01015472412109375,0.016145706176757812,0.009912729263305664,0.010360002517700195,0.01027369499206543,0.04749417304992676,0.12041687965393066,0.4206259250640869,0.554124116897583,0.0392763614654541,0.059766292572021484,0.04034829139709473,0.06092262268066406,0.06071805953979492,0.060288429260253906,0.06033015251159668,0.05971670150756836,0.06188321113586426,0.059305429458618164,0.060742855072021484,0.06127524375915527,0.10937094688415527,0.12067365646362305,0.502509355545044,0.6415293216705322,0.06179332733154297,0.0610048770904541,0.061728477478027344,0.061335086822509766,0.06020474433898926 diff --git a/results/combined/merges_timed/conveyal/osm-lib.csv b/results/combined/merges_timed/conveyal/osm-lib.csv index 30bb886192..ffe9c8f81f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,True,20,66,851,2,True,20,Tests_passed,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,True,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,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,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,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,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,597a87326ae4b997c082ce1b898e7f7fdc6196735b61d8ca2c38d859c01a4849,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,0.047125816345214844,0.04700756072998047,0.06699132919311523,0.07524657249450684,0.06673789024353027,0.06655669212341309,0.06665897369384766,0.11098384857177734,0.10310912132263184,0.6743433475494385,0.5115578174591064,0.11202526092529297,0.14367341995239258,0.11904382705688477,0.1427774429321289,0.145979642868042 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,True,20,66,851,2,True,20,Tests_passed,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,True,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,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,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,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,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,597a87326ae4b997c082ce1b898e7f7fdc6196735b61d8ca2c38d859c01a4849,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,0.047125816345214844,0.04700756072998047,0.06699132919311523,0.07524657249450684,0.06673789024353027,0.06655669212341309,0.06665897369384766,0.11098384857177734,0.10310912132263184,0.6743433475494385,0.5115578174591064,0.11202526092529297,0.14367341995239258,0.11904382705688477,0.1427774429321289,0.145979642868042,0.13785600662231445,0.13932514190673828,0.15782952308654785,0.16833043098449707,0.15833544731140137,0.16534209251403809,0.15953564643859863,0.20897436141967773,0.19609522819519043,0.8057177066802979,0.5941476821899414,0.1400463581085205,0.13779067993164062,0.13929009437561035,0.14754486083984375,0.14830255508422852 diff --git a/results/combined/merges_timed/corentin59/artnetstack.csv b/results/combined/merges_timed/corentin59/artnetstack.csv index ce50ee8a75..7c02509d4e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,Tests_passed,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,True,20,272,1142.0,2,True,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,True,20,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,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Tests_failed,f758074615116886006b0ddf5897af8be30a193f592308b2f4e8b5ca52ce7aea,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,5ee4cddd88e5fbcdc59b2524b269ada392d2a07bef2b752cc3283e2af4b08d85,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,db7fb9fd1d846a2ac05e40e635afc3541677942424fe85f0307aade1e323ca05,Tests_failed,bd35d82a6bddd256980fbfc5a8b8988506b12481670a191ff64a4a2a64d61ba4,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,0.04260420799255371,0.04081463813781738,0.04115581512451172,0.015413761138916016,0.03542375564575195,0.04297518730163574,0.04316425323486328,0.1633315086364746,0.11738395690917969,0.7153482437133789,0.3934667110443115,0.04089784622192383,0.04344439506530762,0.04151606559753418,0.04401540756225586,0.04318809509277344 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,Tests_passed,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,True,20,272,1142.0,2,True,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,True,20,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,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Tests_failed,f758074615116886006b0ddf5897af8be30a193f592308b2f4e8b5ca52ce7aea,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,5ee4cddd88e5fbcdc59b2524b269ada392d2a07bef2b752cc3283e2af4b08d85,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,db7fb9fd1d846a2ac05e40e635afc3541677942424fe85f0307aade1e323ca05,Tests_failed,bd35d82a6bddd256980fbfc5a8b8988506b12481670a191ff64a4a2a64d61ba4,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,0.04260420799255371,0.04081463813781738,0.04115581512451172,0.015413761138916016,0.03542375564575195,0.04297518730163574,0.04316425323486328,0.1633315086364746,0.11738395690917969,0.7153482437133789,0.3934667110443115,0.04089784622192383,0.04344439506530762,0.04151606559753418,0.04401540756225586,0.04318809509277344,0.04219698905944824,0.041277170181274414,0.04099702835083008,0.04067492485046387,0.04091334342956543,0.04179692268371582,0.04043412208557129,0.07256937026977539,0.08989834785461426,0.7406625747680664,0.4545419216156006,0.04118776321411133,0.04165196418762207,0.04143691062927246,0.04114055633544922,0.04225945472717285 diff --git a/results/combined/merges_timed/corfudb/corfudb.csv b/results/combined/merges_timed/corfudb/corfudb.csv index 327fc1eed8..4b0b750e69 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,True,True,Tests_passed,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,True,27,79,884,2,True,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,True,27,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,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,993375e867a666872a3b053c98a0dcc5b5b572bcbd6da5f0f46d68c4efaa62b9,Tests_passed,52e496fec194ea6c69792ebca22e4dd6f8f22ff3804ff13f923c26a28c39436c,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Tests_failed,d5434d29a8e954ff9967adbde9176d8ad0054303a2e830330457dcc3fc7dcd98,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,0.08862090110778809,0.09194540977478027,0.10686326026916504,0.021305561065673828,0.1059725284576416,0.10632944107055664,0.1060945987701416,0.28328680992126465,0.15122771263122559,0.0925896167755127,0.7613368034362793,0.05359387397766113,0.05590629577636719,0.0971522331237793,0.053484439849853516,0.05211687088012695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,True,True,Tests_passed,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,True,27,79,884,2,True,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,True,27,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,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,993375e867a666872a3b053c98a0dcc5b5b572bcbd6da5f0f46d68c4efaa62b9,Tests_passed,52e496fec194ea6c69792ebca22e4dd6f8f22ff3804ff13f923c26a28c39436c,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Tests_failed,d5434d29a8e954ff9967adbde9176d8ad0054303a2e830330457dcc3fc7dcd98,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,0.08862090110778809,0.09194540977478027,0.10686326026916504,0.021305561065673828,0.1059725284576416,0.10632944107055664,0.1060945987701416,0.28328680992126465,0.15122771263122559,0.0925896167755127,0.7613368034362793,0.05359387397766113,0.05590629577636719,0.0971522331237793,0.053484439849853516,0.05211687088012695,0.05468153953552246,0.05397939682006836,0.05357170104980469,0.05362558364868164,0.052652597427368164,0.07264995574951172,0.0548095703125,0.09317803382873535,0.1209568977355957,0.07106685638427734,0.873673677444458,0.053427696228027344,0.052832841873168945,0.05500507354736328,0.06986498832702637,0.05258440971374512 diff --git a/results/combined/merges_timed/couchbase/couchbasemock.csv b/results/combined/merges_timed/couchbase/couchbasemock.csv index c7718e75d9..ed1f6a66d0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,True,True,Tests_passed,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,True,9,20,133,12,True,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,True,12,True,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,8afa33847f49f5885998824cf45731b06caf28ec3a1c4119e0fe81c49fd65092,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,0.01977992057800293,0.010582685470581055,0.022034168243408203,0.030095577239990234,0.02167344093322754,0.022333860397338867,0.02231311798095703,0.13669657707214355,0.44589710235595703,3.9203929901123047,0.3505747318267822,0.06149458885192871,0.08502840995788574,0.07897138595581055,0.08453106880187988,0.0829007625579834 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,True,True,Tests_passed,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,True,9,20,133,12,True,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,True,12,True,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,8afa33847f49f5885998824cf45731b06caf28ec3a1c4119e0fe81c49fd65092,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,0.01977992057800293,0.010582685470581055,0.022034168243408203,0.030095577239990234,0.02167344093322754,0.022333860397338867,0.02231311798095703,0.13669657707214355,0.44589710235595703,3.9203929901123047,0.3505747318267822,0.06149458885192871,0.08502840995788574,0.07897138595581055,0.08453106880187988,0.0829007625579834,0.0924220085144043,0.09984374046325684,0.0989389419555664,0.08069777488708496,0.08197140693664551,0.09980630874633789,0.10226988792419434,0.22530698776245117,0.28449082374572754,4.139064311981201,0.4547731876373291,0.09629034996032715,0.09904718399047852,0.08175492286682129,0.08237528800964355,0.09428763389587402 diff --git a/results/combined/merges_timed/coutume/imageonmap.csv b/results/combined/merges_timed/coutume/imageonmap.csv index 53327a6037..082f3e641c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,True,15,38,776.0,2,True,15,Tests_passed,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,True,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,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_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,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_failed,24c9d90430fedcf05e9dfe364eeef325d03952e804ff17e454dfc2a881a67861,Tests_failed,273787606c92f46a9230acf924bd09585e7d86344eec4bd182e50799dc8b5f68,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,0.01196146011352539,0.012525796890258789,0.013127565383911133,0.022376298904418945,0.013625383377075195,0.013167619705200195,0.013176918029785156,0.03880476951599121,0.06641340255737305,0.5729920864105225,0.39487195014953613,0.03966999053955078,0.06287527084350586,0.04019021987915039,0.06461644172668457,0.0641641616821289 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,True,15,38,776.0,2,True,15,Tests_passed,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,True,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,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_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,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_failed,24c9d90430fedcf05e9dfe364eeef325d03952e804ff17e454dfc2a881a67861,Tests_failed,273787606c92f46a9230acf924bd09585e7d86344eec4bd182e50799dc8b5f68,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,0.01196146011352539,0.012525796890258789,0.013127565383911133,0.022376298904418945,0.013625383377075195,0.013167619705200195,0.013176918029785156,0.03880476951599121,0.06641340255737305,0.5729920864105225,0.39487195014953613,0.03966999053955078,0.06287527084350586,0.04019021987915039,0.06461644172668457,0.0641641616821289,0.06144261360168457,0.06178617477416992,0.06314826011657715,0.06444501876831055,0.06273484230041504,0.06368470191955566,0.06365633010864258,0.09662723541259766,0.0958261489868164,0.6825094223022461,0.45803260803222656,0.060939788818359375,0.061765193939208984,0.061029672622680664,0.06013965606689453,0.06203031539916992 diff --git a/results/combined/merges_timed/coverity/coverity-security-library.csv b/results/combined/merges_timed/coverity/coverity-security-library.csv index 5806670d1e..0ebe6d2c0c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,Tests_passed,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,True,30,48,2981,2,True,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,True,30,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_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,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_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ce180f38b02cadd2f5bd662a1bc567e5342ce9237b9207e462c03aa808e7f4a7,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,0.05778098106384277,0.05587196350097656,0.051700592041015625,0.018838882446289062,0.013437509536743164,0.05094766616821289,0.052858829498291016,0.17708039283752441,0.11895370483398438,0.616478681564331,0.37355709075927734,0.03651094436645508,0.06101369857788086,0.03555798530578613,0.060582876205444336,0.05991029739379883 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,Tests_passed,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,True,30,48,2981,2,True,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,True,30,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_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,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_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ce180f38b02cadd2f5bd662a1bc567e5342ce9237b9207e462c03aa808e7f4a7,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,0.05778098106384277,0.05587196350097656,0.051700592041015625,0.018838882446289062,0.013437509536743164,0.05094766616821289,0.052858829498291016,0.17708039283752441,0.11895370483398438,0.616478681564331,0.37355709075927734,0.03651094436645508,0.06101369857788086,0.03555798530578613,0.060582876205444336,0.05991029739379883,0.057591915130615234,0.057175636291503906,0.060123443603515625,0.05682253837585449,0.0587310791015625,0.05825328826904297,0.058951616287231445,0.09250330924987793,0.09013891220092773,0.6381039619445801,0.38816237449645996,0.057528018951416016,0.05643343925476074,0.05875515937805176,0.058942556381225586,0.059133291244506836 diff --git a/results/combined/merges_timed/cowtowncoder/java-classmate.csv b/results/combined/merges_timed/cowtowncoder/java-classmate.csv index f749bc8d40..a8ad6afd2f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,True,True,True,13,21,68,2,True,13,Tests_passed,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,True,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,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,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,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,6269132643d744d825da9f638166a945785b6ee8089b6d8330129920ce66078d,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,0.04842329025268555,0.056157588958740234,0.04538774490356445,0.023031234741210938,0.06424593925476074,0.0466303825378418,0.044721126556396484,0.17714929580688477,0.11199951171875,0.9171280860900879,0.5676167011260986,0.039396047592163086,0.06351733207702637,0.0374913215637207,0.06598281860351562,0.06660246849060059 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,True,True,True,13,21,68,2,True,13,Tests_passed,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,True,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,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,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,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,6269132643d744d825da9f638166a945785b6ee8089b6d8330129920ce66078d,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,0.04842329025268555,0.056157588958740234,0.04538774490356445,0.023031234741210938,0.06424593925476074,0.0466303825378418,0.044721126556396484,0.17714929580688477,0.11199951171875,0.9171280860900879,0.5676167011260986,0.039396047592163086,0.06351733207702637,0.0374913215637207,0.06598281860351562,0.06660246849060059,0.06264495849609375,0.06258821487426758,0.0628366470336914,0.06754326820373535,0.06290268898010254,0.06370282173156738,0.06430339813232422,0.09889459609985352,0.09920287132263184,0.946735143661499,0.6071231365203857,0.061907291412353516,0.06356954574584961,0.062142133712768555,0.06433248519897461,0.06234622001647949 diff --git a/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv b/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv index d76a3645cf..afbfc09848 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,True,True,Tests_passed,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,True,4,13,131,2,True,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,True,4,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,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,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,6881dc2c33832af44281e6ff2166b04272585e41296530d3f2835b33b2ad3ac4,Tests_failed,aaeb97beced4b89eadc03c666c5bd63d507ce005204dad5d42b91d14f0f42dd7,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,0.009517431259155273,0.010026693344116211,0.009897708892822266,0.015391826629638672,0.010400772094726562,0.010065555572509766,0.009891033172607422,0.036084651947021484,0.06820487976074219,0.7103888988494873,0.2746560573577881,0.030376672744750977,0.054918766021728516,0.03095078468322754,0.05332469940185547,0.05427193641662598 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,True,True,Tests_passed,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,True,4,13,131,2,True,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,True,4,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,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,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,6881dc2c33832af44281e6ff2166b04272585e41296530d3f2835b33b2ad3ac4,Tests_failed,aaeb97beced4b89eadc03c666c5bd63d507ce005204dad5d42b91d14f0f42dd7,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,0.009517431259155273,0.010026693344116211,0.009897708892822266,0.015391826629638672,0.010400772094726562,0.010065555572509766,0.009891033172607422,0.036084651947021484,0.06820487976074219,0.7103888988494873,0.2746560573577881,0.030376672744750977,0.054918766021728516,0.03095078468322754,0.05332469940185547,0.05427193641662598,0.0527348518371582,0.05286383628845215,0.05300545692443848,0.052962303161621094,0.05218172073364258,0.05208539962768555,0.05232572555541992,0.08236122131347656,0.08403348922729492,0.7303781509399414,0.30481934547424316,0.05343198776245117,0.05283713340759277,0.05344200134277344,0.05376076698303223,0.052696943283081055 diff --git a/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv b/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv index d590e8a974..ba31ec3de9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,Tests_passed,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,True,9,15,103,2,True,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,True,9,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,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,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,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,f07cf051ded84b3d0d391d57d98ed67b69768111f9c46d374b08f2a501f6a0e7,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,0.04688620567321777,0.044298648834228516,0.046773433685302734,0.019381999969482422,0.05207180976867676,0.05414462089538574,0.059834957122802734,0.16636252403259277,0.11523890495300293,0.6558089256286621,0.347642183303833,0.03696942329406738,0.061278581619262695,0.037042856216430664,0.06304478645324707,0.06243395805358887 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,Tests_passed,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,True,9,15,103,2,True,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,True,9,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,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,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,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,f07cf051ded84b3d0d391d57d98ed67b69768111f9c46d374b08f2a501f6a0e7,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,0.04688620567321777,0.044298648834228516,0.046773433685302734,0.019381999969482422,0.05207180976867676,0.05414462089538574,0.059834957122802734,0.16636252403259277,0.11523890495300293,0.6558089256286621,0.347642183303833,0.03696942329406738,0.061278581619262695,0.037042856216430664,0.06304478645324707,0.06243395805358887,0.06060624122619629,0.059386253356933594,0.06285858154296875,0.061899662017822266,0.060251474380493164,0.06243586540222168,0.06171154975891113,0.09408116340637207,0.09322452545166016,0.6992776393890381,0.39331674575805664,0.06016254425048828,0.06037402153015137,0.060500383377075195,0.06021380424499512,0.058733224868774414 diff --git a/results/combined/merges_timed/craigwblake/redline.csv b/results/combined/merges_timed/craigwblake/redline.csv index a1218e9d83..7d876936f2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,True,25,124,829,3,True,25,Tests_passed,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,True,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,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,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Tests_failed,f5932d025d6bbcfd68d6f2e7a138a1c0b425cf878fa51248e14daa2f9610ad04,Merge_failed,47712bcd8220702b9b49e45704a11b918d6834b9032bd6a6a6fd3c52f75f40a0,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,c6758caf15803cc9aad930220d17100bdfebba22b39606a8d3983b8d9472f039,Merge_failed,3e673a191a4b0a789ccd44bb2ae4751bf060c494fa0f9782ca32f32482bbb522,Tests_passed,89111ff3683c9b8b2c1f8fb8a483688ca0dd998241ba517cb655f2cc2a11552d,Tests_failed,ef6017e6637fa81f34e8d4664e20500ccff01ab867e9c7b3ec90dccce1b32c16,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,0.012245655059814453,0.012317657470703125,0.013009309768676758,0.01866769790649414,0.013041019439697266,0.013355255126953125,0.012796878814697266,0.05112409591674805,0.12578892707824707,1.4114482402801514,0.7128942012786865,0.06558370590209961,0.06901359558105469,0.05895233154296875,0.0687093734741211,0.07046985626220703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,True,25,124,829,3,True,25,Tests_passed,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,True,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,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,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Tests_failed,f5932d025d6bbcfd68d6f2e7a138a1c0b425cf878fa51248e14daa2f9610ad04,Merge_failed,47712bcd8220702b9b49e45704a11b918d6834b9032bd6a6a6fd3c52f75f40a0,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,c6758caf15803cc9aad930220d17100bdfebba22b39606a8d3983b8d9472f039,Merge_failed,3e673a191a4b0a789ccd44bb2ae4751bf060c494fa0f9782ca32f32482bbb522,Tests_passed,89111ff3683c9b8b2c1f8fb8a483688ca0dd998241ba517cb655f2cc2a11552d,Tests_failed,ef6017e6637fa81f34e8d4664e20500ccff01ab867e9c7b3ec90dccce1b32c16,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,425c59b319704d316d249c758c239ddfb09e59015d0e570ff24882a8006e43e7,Merge_failed,6ac14f9a2d4d5e77c84fe726f2db667a136d55a8c4c5c9db00f6f7553a8d4c7d,0.012245655059814453,0.012317657470703125,0.013009309768676758,0.01866769790649414,0.013041019439697266,0.013355255126953125,0.012796878814697266,0.05112409591674805,0.12578892707824707,1.4114482402801514,0.7128942012786865,0.06558370590209961,0.06901359558105469,0.05895233154296875,0.0687093734741211,0.07046985626220703,0.06775617599487305,0.06710171699523926,0.06778979301452637,0.0674288272857666,0.0688161849975586,0.0684499740600586,0.06862497329711914,0.11734557151794434,0.13317179679870605,1.4986400604248047,0.7722923755645752,0.06882309913635254,0.06861734390258789,0.06706786155700684,0.06846833229064941,0.06854796409606934 diff --git a/results/combined/merges_timed/creswick/cjwizard.csv b/results/combined/merges_timed/creswick/cjwizard.csv index 742e6c01b9..61f1238cf9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,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,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,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,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,53641dc18e6e14703fd486825700e97a5516e9c83e00ed31a0548ff5cac61ec8,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.03646373748779297,0.042362213134765625,0.04679441452026367,0.017183780670166016,0.051816463470458984,0.039258718490600586,0.04535222053527832,0.16601872444152832,0.1098794937133789,1.12184476852417,0.4011547565460205,0.03451848030090332,0.05904889106750488,0.0331120491027832,0.059255361557006836,0.05849123001098633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,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,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,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,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,53641dc18e6e14703fd486825700e97a5516e9c83e00ed31a0548ff5cac61ec8,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.03646373748779297,0.042362213134765625,0.04679441452026367,0.017183780670166016,0.051816463470458984,0.039258718490600586,0.04535222053527832,0.16601872444152832,0.1098794937133789,1.12184476852417,0.4011547565460205,0.03451848030090332,0.05904889106750488,0.0331120491027832,0.059255361557006836,0.05849123001098633,0.05688309669494629,0.056398868560791016,0.05758380889892578,0.058290958404541016,0.05867147445678711,0.0582122802734375,0.0583798885345459,0.08907222747802734,0.0894310474395752,1.0939624309539795,0.40399909019470215,0.055649518966674805,0.05724835395812988,0.05623126029968262,0.05712270736694336,0.05733847618103027 diff --git a/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv b/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv index 54f4c8b876..0b6b823daf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,True,15,33,197,2,True,15,Tests_passed,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,True,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,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,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,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,04bb63e10f5c194b94ba6b01c025fbe701302d22f26c51337eec61f0be8417e4,Tests_failed,01278c6b8617522361b280c43c1c0f586d91961abf5b99b66c08c45fa774f012,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,0.04108881950378418,0.04434514045715332,0.04111909866333008,0.01743340492248535,0.03910684585571289,0.04032325744628906,0.04710793495178223,0.17396998405456543,0.11359310150146484,0.6642420291900635,0.4315955638885498,0.033988237380981445,0.05604743957519531,0.03381633758544922,0.05781221389770508,0.05806708335876465 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,True,15,33,197,2,True,15,Tests_passed,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,True,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,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,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,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,04bb63e10f5c194b94ba6b01c025fbe701302d22f26c51337eec61f0be8417e4,Tests_failed,01278c6b8617522361b280c43c1c0f586d91961abf5b99b66c08c45fa774f012,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,0.04108881950378418,0.04434514045715332,0.04111909866333008,0.01743340492248535,0.03910684585571289,0.04032325744628906,0.04710793495178223,0.17396998405456543,0.11359310150146484,0.6642420291900635,0.4315955638885498,0.033988237380981445,0.05604743957519531,0.03381633758544922,0.05781221389770508,0.05806708335876465,0.05476999282836914,0.054697513580322266,0.05697059631347656,0.05821371078491211,0.05636954307556152,0.05508542060852051,0.0557558536529541,0.08832263946533203,0.0844273567199707,0.7109031677246094,0.4596724510192871,0.0558629035949707,0.053259849548339844,0.05601835250854492,0.05660247802734375,0.05853009223937988 diff --git a/results/combined/merges_timed/cternes/openkeepass.csv b/results/combined/merges_timed/cternes/openkeepass.csv index d8e260a653..00aa3c4353 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,True,38,119,767,3,True,38,Tests_passed,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,True,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,19ce7a4296517faa89f86279bf3a90fd977c882d51305bf75abbbf2c99f133c5,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Tests_failed,e6a4f25f27dde16ec7b1430d8b6a056c83eb278028d1337aaded5ffe4eee5e15,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,a6f4e75c9e9fadb6c0792ca87c77d7032ba91271ccf670ae7a9c64806417438b,Tests_failed,cd93847763ca72639156c5e3df3d39fcf693fec6e3d48a8889e3aa14b3bc64eb,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,0.044588565826416016,0.04640626907348633,0.02872157096862793,0.018230199813842773,0.03983259201049805,0.047217607498168945,0.04508256912231445,0.24869871139526367,0.17644262313842773,1.592029094696045,0.7297053337097168,0.05849885940551758,0.07886195182800293,0.04926466941833496,0.08482670783996582,0.07816243171691895 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,True,38,119,767,3,True,38,Tests_passed,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,True,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,19ce7a4296517faa89f86279bf3a90fd977c882d51305bf75abbbf2c99f133c5,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Tests_failed,e6a4f25f27dde16ec7b1430d8b6a056c83eb278028d1337aaded5ffe4eee5e15,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,a6f4e75c9e9fadb6c0792ca87c77d7032ba91271ccf670ae7a9c64806417438b,Tests_failed,cd93847763ca72639156c5e3df3d39fcf693fec6e3d48a8889e3aa14b3bc64eb,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,Tests_passed,cc7099dd4514b9fa91e5259d2bf0969d5e70cb6221eaf9252eb751e6b80c56b0,0.044588565826416016,0.04640626907348633,0.02872157096862793,0.018230199813842773,0.03983259201049805,0.047217607498168945,0.04508256912231445,0.24869871139526367,0.17644262313842773,1.592029094696045,0.7297053337097168,0.05849885940551758,0.07886195182800293,0.04926466941833496,0.08482670783996582,0.07816243171691895,0.0811471939086914,0.08770036697387695,0.09124040603637695,0.08025312423706055,0.08967161178588867,0.0887751579284668,0.08070850372314453,0.14075136184692383,0.15612435340881348,1.8514153957366943,0.8963050842285156,0.08713746070861816,0.08700013160705566,0.08158707618713379,0.08736014366149902,0.08446955680847168 diff --git a/results/combined/merges_timed/ctran/tinyradius.csv b/results/combined/merges_timed/ctran/tinyradius.csv index 5564e4b310..543aab593c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,True,10,37,271,2,True,10,Tests_passed,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,True,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,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,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,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,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,67380e95bd88e143d45b891677d9007e7bc89d4de1036d3a1fe8573e65456133,Tests_failed,e705795583de630a909eaada49163a83287963a444868bab801a2c22ab8c98a4,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,0.012056589126586914,0.011953353881835938,0.013063192367553711,0.01972794532775879,0.013204336166381836,0.013319253921508789,0.0135955810546875,0.04078555107116699,0.07064104080200195,0.9391317367553711,0.3903229236602783,0.03476667404174805,0.06161808967590332,0.03622007369995117,0.06040453910827637,0.0626215934753418 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,True,10,37,271,2,True,10,Tests_passed,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,True,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,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,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,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,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,67380e95bd88e143d45b891677d9007e7bc89d4de1036d3a1fe8573e65456133,Tests_failed,e705795583de630a909eaada49163a83287963a444868bab801a2c22ab8c98a4,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,0.012056589126586914,0.011953353881835938,0.013063192367553711,0.01972794532775879,0.013204336166381836,0.013319253921508789,0.0135955810546875,0.04078555107116699,0.07064104080200195,0.9391317367553711,0.3903229236602783,0.03476667404174805,0.06161808967590332,0.03622007369995117,0.06040453910827637,0.0626215934753418,0.05991649627685547,0.05823802947998047,0.06278610229492188,0.061463356018066406,0.06049060821533203,0.06080961227416992,0.061141014099121094,0.0897531509399414,0.0912625789642334,0.9460968971252441,0.43297839164733887,0.05906534194946289,0.057820796966552734,0.06039118766784668,0.058283090591430664,0.05908632278442383 diff --git a/results/combined/merges_timed/dabsquared/gitlab-plugin.csv b/results/combined/merges_timed/dabsquared/gitlab-plugin.csv index a61339aef9..61c85ae15e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,True,37,159,728,2,True,37,Tests_passed,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,True,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,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,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,07758e44a1d61e35cfd79b826debb6a5e99e166fb4da2ebb0444ab50ec53a0e9,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,0.012727975845336914,0.01833653450012207,0.0224459171295166,0.033158302307128906,0.021999835968017578,0.014336347579956055,0.021952390670776367,0.05077028274536133,0.07353687286376953,0.8451938629150391,1.104487657546997,0.04132699966430664,0.08123373985290527,0.0412747859954834,0.08059906959533691,0.06830859184265137 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,True,37,159,728,2,True,37,Tests_passed,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,True,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,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,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,07758e44a1d61e35cfd79b826debb6a5e99e166fb4da2ebb0444ab50ec53a0e9,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,Tests_passed,024b9985482dbaa4aa5de9b82ebdfd0f289f1981e5ff233f2cb197b530bb2b79,0.012727975845336914,0.01833653450012207,0.0224459171295166,0.033158302307128906,0.021999835968017578,0.014336347579956055,0.021952390670776367,0.05077028274536133,0.07353687286376953,0.8451938629150391,1.104487657546997,0.04132699966430664,0.08123373985290527,0.0412747859954834,0.08059906959533691,0.06830859184265137,0.08033490180969238,0.06849050521850586,0.08488774299621582,0.0899343490600586,0.06724858283996582,0.0885477066040039,0.07156682014465332,0.13147926330566406,0.09934854507446289,1.0907487869262695,1.248408317565918,0.0840296745300293,0.0679175853729248,0.0835421085357666,0.06858992576599121,0.08691573143005371 diff --git a/results/combined/merges_timed/dakusui/jcunit.csv b/results/combined/merges_timed/dakusui/jcunit.csv index 5b31e3cca2..59d4b05540 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -94,refs/remotes/origin/archive-0.8.x-experiment-join,7f2740c44e080329b840996c537f006154566e5a,3f10eff6a4b93dc09797d2105707864577323c46,7c8b99f1e932c6dd8cd3f2bb7a3d6c824001f57f,,True,True,True,8,23,243,2,True,8,Tests_passed,bfffbfa98d1d5e06d2150e4683c3811b8d5175cb62f291515c6b9a26d67755e3,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,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,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_failed,aac781ae55b3422f77b1d1d6f349a6f0fccf2232ba4dfa135f694981c46fce17,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,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,bab61d0c912b898e6ebfbc1400733ba7768494bc2d25b7d9f6d61ea53e5d9407,Tests_failed,aac781ae55b3422f77b1d1d6f349a6f0fccf2232ba4dfa135f694981c46fce17,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,0.04571223258972168,0.015544652938842773,0.05146288871765137,0.01898932456970215,0.0527796745300293,0.03360605239868164,0.05479693412780762,0.17933297157287598,0.11561846733093262,1.2018201351165771,0.5768969058990479,0.07587480545043945,0.062311410903930664,0.07576966285705566,0.06232476234436035,0.0650017261505127 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +94,refs/remotes/origin/archive-0.8.x-experiment-join,7f2740c44e080329b840996c537f006154566e5a,3f10eff6a4b93dc09797d2105707864577323c46,7c8b99f1e932c6dd8cd3f2bb7a3d6c824001f57f,,True,True,True,8,23,243,2,True,8,Tests_passed,bfffbfa98d1d5e06d2150e4683c3811b8d5175cb62f291515c6b9a26d67755e3,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,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,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_failed,aac781ae55b3422f77b1d1d6f349a6f0fccf2232ba4dfa135f694981c46fce17,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,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,bab61d0c912b898e6ebfbc1400733ba7768494bc2d25b7d9f6d61ea53e5d9407,Tests_failed,aac781ae55b3422f77b1d1d6f349a6f0fccf2232ba4dfa135f694981c46fce17,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,0.04571223258972168,0.015544652938842773,0.05146288871765137,0.01898932456970215,0.0527796745300293,0.03360605239868164,0.05479693412780762,0.17933297157287598,0.11561846733093262,1.2018201351165771,0.5768969058990479,0.07587480545043945,0.062311410903930664,0.07576966285705566,0.06232476234436035,0.0650017261505127,0.057567596435546875,0.10467410087585449,0.0619809627532959,0.1087031364440918,0.06066417694091797,0.10452985763549805,0.06208944320678711,0.12682104110717773,0.13594985008239746,1.19692063331604,0.6196861267089844,0.06157279014587402,0.10369300842285156,0.06260371208190918,0.09967875480651855,0.062331438064575195 diff --git a/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv b/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv index a4f7f806bd..f98ab4c24d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,True,5,15,264.0,2,True,5,Tests_passed,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,True,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,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,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,e2e207d71040b904d0c430a2d6a9cac009d21941ab558a257a7b3954b696b012,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,d352035c47339773a0df6f6070799710d57dba9f4750671a8e644f60bdc28630,Tests_failed,bd07b11e5d564eedb43c1c0eef48dc41c0f06e4bde5104d77d21e751fcdc35b4,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,0.009885549545288086,0.010724782943725586,0.01417684555053711,0.01760125160217285,0.010121583938598633,0.009806394577026367,0.009602069854736328,0.0691835880279541,0.06885623931884766,0.681602954864502,0.2988927364349365,0.05319690704345703,0.042380571365356445,0.04222464561462402,0.044629573822021484,0.05795001983642578 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,True,5,15,264.0,2,True,5,Tests_passed,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,True,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,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,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,e2e207d71040b904d0c430a2d6a9cac009d21941ab558a257a7b3954b696b012,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,d352035c47339773a0df6f6070799710d57dba9f4750671a8e644f60bdc28630,Tests_failed,bd07b11e5d564eedb43c1c0eef48dc41c0f06e4bde5104d77d21e751fcdc35b4,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,a38cb0b143851eb6f08efb6c20109695169edc0fa6d102aeeabfd5b20688601f,0.009885549545288086,0.010724782943725586,0.01417684555053711,0.01760125160217285,0.010121583938598633,0.009806394577026367,0.009602069854736328,0.0691835880279541,0.06885623931884766,0.681602954864502,0.2988927364349365,0.05319690704345703,0.042380571365356445,0.04222464561462402,0.044629573822021484,0.05795001983642578,0.041895151138305664,0.055844783782958984,0.042839765548706055,0.057383060455322266,0.0421602725982666,0.04201078414916992,0.04302573204040527,0.07188630104064941,0.07397294044494629,0.6639153957366943,0.35717177391052246,0.04249453544616699,0.042955636978149414,0.04222726821899414,0.04221606254577637,0.0536494255065918 diff --git a/results/combined/merges_timed/danielgronau/highj.csv b/results/combined/merges_timed/danielgronau/highj.csv index 7d39dfba7a..6d0baccfec 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,True,254,698,1975,4,True,254,Tests_passed,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,True,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,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,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Merge_timedout,,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,c5656ea70e699223bbd0c6eb2750d116fe3a3626645822c2a612a419f0f23712,Merge_timedout,,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,0.07220315933227539,0.06838583946228027,0.04171633720397949,0.04184246063232422,0.07147479057312012,0.06343364715576172,0.06454896926879883,0.2739529609680176,0.22988200187683105,1.5473601818084717,-1.0,0.06725645065307617,0.13097381591796875,0.06809735298156738,0.13044261932373047,0.12834835052490234 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,True,254,698,1975,4,True,254,Tests_passed,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,True,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,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,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Merge_timedout,,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,c5656ea70e699223bbd0c6eb2750d116fe3a3626645822c2a612a419f0f23712,Merge_timedout,,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,9229954fc75f251460a7988f2172a39fac3c878076bc83de9df26c49318a46a7,Tests_passed,b226a6b48a531f9b793da7d38588f29eb758c3847ffdec1e356e756ed0fa9763,0.07220315933227539,0.06838583946228027,0.04171633720397949,0.04184246063232422,0.07147479057312012,0.06343364715576172,0.06454896926879883,0.2739529609680176,0.22988200187683105,1.5473601818084717,-1.0,0.06725645065307617,0.13097381591796875,0.06809735298156738,0.13044261932373047,0.12834835052490234,0.1315476894378662,0.1312704086303711,0.13153743743896484,0.13433599472045898,0.13317275047302246,0.13368964195251465,0.1348872184753418,0.2181837558746338,0.21145176887512207,1.6905407905578613,-1.0,0.13271474838256836,0.1278092861175537,0.12971258163452148,0.12940645217895508,0.12976670265197754 diff --git a/results/combined/merges_timed/danielnorberg/auto-matter.csv b/results/combined/merges_timed/danielnorberg/auto-matter.csv index c8ac175f65..c608416fd5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,True,26,72,716,8,True,27,Tests_passed,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,True,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,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,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,970e3443f3488bfdbc7edb1a407e53e9e505d9919e69ccf69a1149594bbbc158,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,709705cee23008215fd8022d163db1f6589e411b369fb283661c77baefbc3b97,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,0.04670310020446777,0.050632476806640625,0.05260276794433594,0.021979093551635742,0.05225992202758789,0.04320192337036133,0.046372413635253906,0.5303349494934082,0.3765380382537842,2.546903133392334,0.5779132843017578,0.044974327087402344,0.1600501537322998,0.048928022384643555,0.15396785736083984,0.15820622444152832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,True,26,72,716,8,True,27,Tests_passed,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,True,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,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,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,970e3443f3488bfdbc7edb1a407e53e9e505d9919e69ccf69a1149594bbbc158,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,709705cee23008215fd8022d163db1f6589e411b369fb283661c77baefbc3b97,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,0.04670310020446777,0.050632476806640625,0.05260276794433594,0.021979093551635742,0.05225992202758789,0.04320192337036133,0.046372413635253906,0.5303349494934082,0.3765380382537842,2.546903133392334,0.5779132843017578,0.044974327087402344,0.1600501537322998,0.048928022384643555,0.15396785736083984,0.15820622444152832,0.1534411907196045,0.15797877311706543,0.160477876663208,0.16402101516723633,0.15754199028015137,0.16232085227966309,0.15931916236877441,0.27351856231689453,0.31732702255249023,2.71980357170105,0.7670655250549316,0.15722131729125977,0.1552722454071045,0.15595746040344238,0.1586451530456543,0.16052770614624023 diff --git a/results/combined/merges_timed/dankurka/gwtphonegap.csv b/results/combined/merges_timed/dankurka/gwtphonegap.csv index 00688c8fed..36d5fef941 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,True,21,63,419,2,True,21,Tests_passed,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,True,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,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,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,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,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,6cde347cee3cd6d4848d28a1ac53b2aed60fc7666ffdcd7abf5b2f082fb17379,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,0.01567673683166504,0.010325431823730469,0.019463062286376953,0.017145633697509766,0.01933598518371582,0.01943826675415039,0.010653257369995117,0.04733133316040039,0.07062625885009766,0.4834458827972412,0.35512614250183105,0.03494620323181152,0.07627034187316895,0.052289724349975586,0.057713985443115234,0.05544137954711914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,True,21,63,419,2,True,21,Tests_passed,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,True,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,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,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,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,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,6cde347cee3cd6d4848d28a1ac53b2aed60fc7666ffdcd7abf5b2f082fb17379,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,0.01567673683166504,0.010325431823730469,0.019463062286376953,0.017145633697509766,0.01933598518371582,0.01943826675415039,0.010653257369995117,0.04733133316040039,0.07062625885009766,0.4834458827972412,0.35512614250183105,0.03494620323181152,0.07627034187316895,0.052289724349975586,0.057713985443115234,0.05544137954711914,0.05869126319885254,0.07027554512023926,0.055535078048706055,0.05507326126098633,0.07430815696716309,0.07936620712280273,0.055806875228881836,0.08894681930541992,0.10453677177429199,0.5466859340667725,0.3787384033203125,0.05673670768737793,0.054414987564086914,0.06932759284973145,0.07089900970458984,0.054471731185913086 diff --git a/results/combined/merges_timed/dankurka/mgwt.csv b/results/combined/merges_timed/dankurka/mgwt.csv index 8af7ebe74e..eeeb1da61e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,True,25,62,137,2,True,25,Tests_passed,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,True,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,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,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,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,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,d7332b2f1451cff9ce131584922bdcf60ebad36c530f0760d33d5f6a93e1091a,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,0.014330387115478516,0.013762712478637695,0.01601099967956543,0.02270364761352539,0.015629291534423828,0.016180753707885742,0.015463829040527344,0.045032501220703125,0.06991934776306152,0.6943345069885254,0.5769205093383789,0.04599475860595703,0.07006525993347168,0.046002864837646484,0.0725862979888916,0.07211685180664062 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,True,25,62,137,2,True,25,Tests_passed,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,True,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,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,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,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,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,d7332b2f1451cff9ce131584922bdcf60ebad36c530f0760d33d5f6a93e1091a,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,0.014330387115478516,0.013762712478637695,0.01601099967956543,0.02270364761352539,0.015629291534423828,0.016180753707885742,0.015463829040527344,0.045032501220703125,0.06991934776306152,0.6943345069885254,0.5769205093383789,0.04599475860595703,0.07006525993347168,0.046002864837646484,0.0725862979888916,0.07211685180664062,0.06845355033874512,0.06834959983825684,0.07012629508972168,0.06828069686889648,0.07169342041015625,0.06963038444519043,0.07103228569030762,0.10639810562133789,0.10202622413635254,0.7921061515808105,0.6288876533508301,0.06778383255004883,0.06850767135620117,0.06721258163452148,0.06683182716369629,0.0677490234375 diff --git a/results/combined/merges_timed/darcy-framework/darcy-ui.csv b/results/combined/merges_timed/darcy-framework/darcy-ui.csv index 00ec94096c..c251381803 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,True,6,9,95,2,True,7,Tests_passed,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,True,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,True,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,70a5eb4204f75505c73ab3ef840e144b2b292d82f1115aa84ca73390ede142a7,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,d5a30fc9bacfe2fbf80ed4fff8815e3cdf3a36a00a8522de9eabcd5eba58bcb9,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,58072ffb292eab1d1ed2411522dfd9c8027fe8dd9b5d9a238fd3e51364c349e9,Tests_passed,2a93a87b017eb7b71e0c44ab8fc2a18830b5076f6b655bbcb790df2349843f44,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,0.010597467422485352,0.032956600189208984,0.051917314529418945,0.016418933868408203,0.03530168533325195,0.035765886306762695,0.03473067283630371,0.12940573692321777,0.11754155158996582,0.6139423847198486,0.27582693099975586,0.04262232780456543,0.04409527778625488,0.04359149932861328,0.0451512336730957,0.044889211654663086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,True,6,9,95,2,True,7,Tests_passed,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,True,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,True,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,70a5eb4204f75505c73ab3ef840e144b2b292d82f1115aa84ca73390ede142a7,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,d5a30fc9bacfe2fbf80ed4fff8815e3cdf3a36a00a8522de9eabcd5eba58bcb9,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,58072ffb292eab1d1ed2411522dfd9c8027fe8dd9b5d9a238fd3e51364c349e9,Tests_passed,2a93a87b017eb7b71e0c44ab8fc2a18830b5076f6b655bbcb790df2349843f44,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,0.010597467422485352,0.032956600189208984,0.051917314529418945,0.016418933868408203,0.03530168533325195,0.035765886306762695,0.03473067283630371,0.12940573692321777,0.11754155158996582,0.6139423847198486,0.27582693099975586,0.04262232780456543,0.04409527778625488,0.04359149932861328,0.0451512336730957,0.044889211654663086,0.04357123374938965,0.045481204986572266,0.04704546928405762,0.045713186264038086,0.04669356346130371,0.04661083221435547,0.045207977294921875,0.0777733325958252,0.08545494079589844,0.7566492557525635,0.3657963275909424,0.04667472839355469,0.04650139808654785,0.04595494270324707,0.046768903732299805,0.045069217681884766 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-core.csv b/results/combined/merges_timed/datanucleus/datanucleus-core.csv index 999b5be617..a7e0317ad5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,False,True,2,1,10.0,2,True,2,Tests_passed,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,True,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,True,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,87b585e824fd58878ca8e11dbd73a6f4f67d7dbe80755330c5619540516db72a,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,Tests_passed,b6bc5ef22ea4d229eb6c15c235d8441fa32db539cf492152f59d396ae60d417d,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,266e4cfe80b801d7ff00c95925ff457b9ef54b50871c5f0c4ed61711537f25f5,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,2f2e4f85970d89ceebcf9a7eb35ee4612447f39aa19bab8aa59da1c0d80030ae,Tests_failed,f6d3b8cf99ecef9b134e3435acf62bdec1bbfd5716c465ca285422b7cd4b5f8d,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,0.05369377136230469,0.05219888687133789,0.047452688217163086,0.01727604866027832,0.05171465873718262,0.04989314079284668,0.052297353744506836,0.20630550384521484,0.12472343444824219,0.8847665786743164,0.3058302402496338,0.05653786659240723,0.04687166213989258,0.04691505432128906,0.04766678810119629,0.0475468635559082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,False,True,2,1,10.0,2,True,2,Tests_passed,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,True,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,True,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,87b585e824fd58878ca8e11dbd73a6f4f67d7dbe80755330c5619540516db72a,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,Tests_passed,b6bc5ef22ea4d229eb6c15c235d8441fa32db539cf492152f59d396ae60d417d,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,266e4cfe80b801d7ff00c95925ff457b9ef54b50871c5f0c4ed61711537f25f5,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,2f2e4f85970d89ceebcf9a7eb35ee4612447f39aa19bab8aa59da1c0d80030ae,Tests_failed,f6d3b8cf99ecef9b134e3435acf62bdec1bbfd5716c465ca285422b7cd4b5f8d,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,0.05369377136230469,0.05219888687133789,0.047452688217163086,0.01727604866027832,0.05171465873718262,0.04989314079284668,0.052297353744506836,0.20630550384521484,0.12472343444824219,0.8847665786743164,0.3058302402496338,0.05653786659240723,0.04687166213989258,0.04691505432128906,0.04766678810119629,0.0475468635559082,0.0476689338684082,0.0477445125579834,0.04716372489929199,0.04832959175109863,0.046509504318237305,0.0481109619140625,0.04691600799560547,0.08211946487426758,0.08275008201599121,1.083005428314209,0.38306713104248047,0.0474700927734375,0.04735994338989258,0.04775834083557129,0.047769784927368164,0.04795265197753906 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv b/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv index 57e758d846..8993dbe141 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,False,True,2,3,7.0,2,True,2,Tests_passed,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,True,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,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,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,20d8981abebd565b49ee8a087f6f8a0520f5c5eb0bcc5e215d78c227fbc121dc,Tests_failed,739868a86d5dc63777f97cb1047b8c4b0ccf98b24357c2561f244bba28922df4,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,0.04441094398498535,0.0469517707824707,0.04565143585205078,0.017690181732177734,0.0476531982421875,0.052951812744140625,0.05333232879638672,0.18529081344604492,0.11692953109741211,1.5724849700927734,0.4177243709564209,0.03752493858337402,0.06947517395019531,0.03766632080078125,0.06791472434997559,0.06723546981811523 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,False,True,2,3,7.0,2,True,2,Tests_passed,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,True,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,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,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,20d8981abebd565b49ee8a087f6f8a0520f5c5eb0bcc5e215d78c227fbc121dc,Tests_failed,739868a86d5dc63777f97cb1047b8c4b0ccf98b24357c2561f244bba28922df4,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,Tests_passed,2c710bf60626af3645e0f5ab7e87722e23bf40aa08b8c6b0a62043ee7d1fe13f,0.04441094398498535,0.0469517707824707,0.04565143585205078,0.017690181732177734,0.0476531982421875,0.052951812744140625,0.05333232879638672,0.18529081344604492,0.11692953109741211,1.5724849700927734,0.4177243709564209,0.03752493858337402,0.06947517395019531,0.03766632080078125,0.06791472434997559,0.06723546981811523,0.06796789169311523,0.06787919998168945,0.06895184516906738,0.06716775894165039,0.06873178482055664,0.0670626163482666,0.0706932544708252,0.10637402534484863,0.10400748252868652,1.8541767597198486,0.4975123405456543,0.07001638412475586,0.06995630264282227,0.07100176811218262,0.06812262535095215,0.07001447677612305 diff --git a/results/combined/merges_timed/datasift/datasift-java.csv b/results/combined/merges_timed/datasift/datasift-java.csv index 8f8aafb5f8..b2ec7b3acb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,8a3d7f4df80693d7f2b43942ab2a2007640d6ea9,09b4a92a47b65a10df0cc273ec6a79b38ddfa2d6,3824498688796efaa27a58166063065537107c2b,,True,True,True,4,14,46,11,True,13,Tests_passed,efd79430b35c7a9994ee73ba6dc230c81987b99ae3b8f99dffc0f7effb1b9c97,True,Tests_passed,d68fd444e23d12793b4d82d394ab0a169c7932d4015c8e62eda59ed1cb4c28e3,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_failed,8bc5c1822ed72ae6995389c2f289c6f3fb984a7cb782fbb875ded5f01e3c645a,Tests_timedout,6ba6b3218e4e494ac5131b7272194d2c2ddb4d500518f40d521bf641e41b9f28,0.039620161056518555,0.0393214225769043,0.03835320472717285,0.016004562377929688,0.02881479263305664,0.02776336669921875,0.03304266929626465,0.1709909439086914,0.11799907684326172,0.7182028293609619,0.4591941833496094,0.036939382553100586,0.06004595756530762,0.037201642990112305,0.0613253116607666,0.05934333801269531 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,8a3d7f4df80693d7f2b43942ab2a2007640d6ea9,09b4a92a47b65a10df0cc273ec6a79b38ddfa2d6,3824498688796efaa27a58166063065537107c2b,,True,True,True,4,14,46,11,True,13,Tests_passed,efd79430b35c7a9994ee73ba6dc230c81987b99ae3b8f99dffc0f7effb1b9c97,True,Tests_passed,d68fd444e23d12793b4d82d394ab0a169c7932d4015c8e62eda59ed1cb4c28e3,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_failed,8bc5c1822ed72ae6995389c2f289c6f3fb984a7cb782fbb875ded5f01e3c645a,Tests_timedout,6ba6b3218e4e494ac5131b7272194d2c2ddb4d500518f40d521bf641e41b9f28,0.039620161056518555,0.0393214225769043,0.03835320472717285,0.016004562377929688,0.02881479263305664,0.02776336669921875,0.03304266929626465,0.1709909439086914,0.11799907684326172,0.7182028293609619,0.4591941833496094,0.036939382553100586,0.06004595756530762,0.037201642990112305,0.0613253116607666,0.05934333801269531,0.05799674987792969,0.07343888282775879,0.07249331474304199,0.07691144943237305,0.058965444564819336,0.059331655502319336,0.05906534194946289,0.08986353874206543,0.09147453308105469,0.7533893585205078,0.49896955490112305,0.05851435661315918,0.05876564979553223,0.05743408203125,0.059026241302490234,0.05811452865600586 diff --git a/results/combined/merges_timed/datastax/java-driver.csv b/results/combined/merges_timed/datastax/java-driver.csv index f8f466fb14..5056642bf9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -538,refs/remotes/origin/2.1,0dd96ea21f85de3a8323926450891971cb36d2e1,1f25c7e3a0bf10b65765b3b23bdcf9a5de30888a,9a4a207038a7ccf60bd70cc3bc71d517337f40f3,,True,True,True,100.0,477,10929.0,2,True,100,Tests_passed,56bb658eeb56b947489fa5d22d290404c17059832dd967db3a913bd832f3f8f2,True,Tests_passed,7772c3712b94da9d5b66f85b99bf764206c4ed6576210ee3887fc1422068ad74,,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,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,dfb9528b359575359a3d1be571bfd04a9a26db5d444d66d5fcf0d89037dd0a75,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,4f4809c475b7681b68b6ef0cdb077cd3fd527250ca7ee8666a7fdbfef7e3060c,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,29d9e96d71246f752ec9b436521e7cf8e8223297c7fa2727cf11a4bcb8695cc1,Tests_failed,d49f299b483f750f86dfecf9df5cf168f778f554bef0f98da003e50b6401de95,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,0.02502918243408203,0.02506279945373535,0.02640676498413086,0.034737348556518555,0.02792525291442871,0.020661115646362305,0.02782750129699707,0.07098126411437988,0.08426976203918457,1.2053499221801758,4.860480785369873,0.069427490234375,0.06404590606689453,0.07354235649108887,0.06307220458984375,0.07635307312011719 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +538,refs/remotes/origin/2.1,0dd96ea21f85de3a8323926450891971cb36d2e1,1f25c7e3a0bf10b65765b3b23bdcf9a5de30888a,9a4a207038a7ccf60bd70cc3bc71d517337f40f3,,True,True,True,100.0,477,10929.0,2,True,100,Tests_passed,56bb658eeb56b947489fa5d22d290404c17059832dd967db3a913bd832f3f8f2,True,Tests_passed,7772c3712b94da9d5b66f85b99bf764206c4ed6576210ee3887fc1422068ad74,,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,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,dfb9528b359575359a3d1be571bfd04a9a26db5d444d66d5fcf0d89037dd0a75,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,4f4809c475b7681b68b6ef0cdb077cd3fd527250ca7ee8666a7fdbfef7e3060c,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,29d9e96d71246f752ec9b436521e7cf8e8223297c7fa2727cf11a4bcb8695cc1,Tests_failed,d49f299b483f750f86dfecf9df5cf168f778f554bef0f98da003e50b6401de95,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,0.02502918243408203,0.02506279945373535,0.02640676498413086,0.034737348556518555,0.02792525291442871,0.020661115646362305,0.02782750129699707,0.07098126411437988,0.08426976203918457,1.2053499221801758,4.860480785369873,0.069427490234375,0.06404590606689453,0.07354235649108887,0.06307220458984375,0.07635307312011719,0.06931304931640625,0.06646418571472168,0.06772589683532715,0.07337808609008789,0.06333231925964355,0.07257270812988281,0.07172417640686035,0.09644651412963867,0.11248064041137695,1.3076703548431396,5.0409324169158936,0.061362504959106445,0.06910443305969238,0.06947588920593262,0.06201958656311035,0.07260465621948242 diff --git a/results/combined/merges_timed/datumbox/datumbox-framework.csv b/results/combined/merges_timed/datumbox/datumbox-framework.csv index c0832b85f1..7356feeead 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,True,85,607,4493,2,True,85,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,True,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,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,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_failed,b15f9f4f92b8995269e43c18e6a2aeda2054147b05b85e35db3766b8f83ff626,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,3ba871003bfe7460b561a6d3d0263f23a2e1469e27f270dc7887125899c5541c,Tests_failed,a4c947abd7070ae163bd4f8132881b9459848b2becfbbd8295358ca45080d675,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,0.0392603874206543,0.03528738021850586,0.06343817710876465,0.036679744720458984,0.04829668998718262,0.04682803153991699,0.06702804565429688,0.2009410858154297,0.13255691528320312,0.6172270774841309,4.068255186080933,0.07499575614929199,0.07317495346069336,0.049886226654052734,0.08508896827697754,0.06874537467956543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,True,85,607,4493,2,True,85,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,True,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,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,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_failed,b15f9f4f92b8995269e43c18e6a2aeda2054147b05b85e35db3766b8f83ff626,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,3ba871003bfe7460b561a6d3d0263f23a2e1469e27f270dc7887125899c5541c,Tests_failed,a4c947abd7070ae163bd4f8132881b9459848b2becfbbd8295358ca45080d675,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Tests_passed,9f0b51c240110f4f6b4422e5b0ff5d06492a19f30423b6f51303a99ae626c20e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,0.0392603874206543,0.03528738021850586,0.06343817710876465,0.036679744720458984,0.04829668998718262,0.04682803153991699,0.06702804565429688,0.2009410858154297,0.13255691528320312,0.6172270774841309,4.068255186080933,0.07499575614929199,0.07317495346069336,0.049886226654052734,0.08508896827697754,0.06874537467956543,0.0746619701385498,0.06994152069091797,0.11470413208007812,0.057717084884643555,0.07837772369384766,0.07991647720336914,0.09813666343688965,0.14471077919006348,0.14075517654418945,0.7595231533050537,4.391381025314331,0.07336950302124023,0.07344651222229004,0.08557605743408203,0.10568118095397949,0.07174897193908691 diff --git a/results/combined/merges_timed/davidb/scala-maven-plugin.csv b/results/combined/merges_timed/davidb/scala-maven-plugin.csv index a5659e0ebe..1f8fdf8404 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,True,23,139,1226,3,True,23,Tests_passed,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,True,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,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,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Tests_failed,cb912c5d9bd087b5c31e83a7449d1eeb5d31466f6b637aca6e2fdc31da172179,Merge_failed,6e743e4900fd16e55571b9f1969231249fbbadc25d8a5a8664aa46dc7f0c3fe0,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,8750800d7756a4d6ca39ae89cd0d7c78538fcec89c8903c8822ff8de53970434,Merge_failed,aa0f361eb16799603dc5518ef305d3ae3a1fbb05928bf2fdd5d0e45fd0d7c43e,Tests_failed,b4fd3c71032698f8eac57837e30aed5e0c4f7bec8870ca950a507fa13012e064,Tests_failed,a665f0e2e242144c96fe2651211ae95e8ead5e70eabe531af33911ac7fba6c20,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,0.044088125228881836,0.051320552825927734,0.01881694793701172,0.021220684051513672,0.033965349197387695,0.037827491760253906,0.04458427429199219,0.20367765426635742,0.13909053802490234,1.531367540359497,0.5997843742370605,0.053399085998535156,0.07315421104431152,0.05022168159484863,0.07176780700683594,0.0866384506225586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,True,23,139,1226,3,True,23,Tests_passed,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,True,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,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,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Tests_failed,cb912c5d9bd087b5c31e83a7449d1eeb5d31466f6b637aca6e2fdc31da172179,Merge_failed,6e743e4900fd16e55571b9f1969231249fbbadc25d8a5a8664aa46dc7f0c3fe0,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,8750800d7756a4d6ca39ae89cd0d7c78538fcec89c8903c8822ff8de53970434,Merge_failed,aa0f361eb16799603dc5518ef305d3ae3a1fbb05928bf2fdd5d0e45fd0d7c43e,Tests_failed,b4fd3c71032698f8eac57837e30aed5e0c4f7bec8870ca950a507fa13012e064,Tests_failed,a665f0e2e242144c96fe2651211ae95e8ead5e70eabe531af33911ac7fba6c20,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Merge_failed,e308e23213713e0478ed4312a52994e6b5aa897a16b26bb1b26bae172906377d,Tests_passed,8109cb00e9348b9e4304b15f318cae23117db15e15e232e8d49995947bad31e1,0.044088125228881836,0.051320552825927734,0.01881694793701172,0.021220684051513672,0.033965349197387695,0.037827491760253906,0.04458427429199219,0.20367765426635742,0.13909053802490234,1.531367540359497,0.5997843742370605,0.053399085998535156,0.07315421104431152,0.05022168159484863,0.07176780700683594,0.0866384506225586,0.0705561637878418,0.09209823608398438,0.06444048881530762,0.093292236328125,0.07060790061950684,0.07170367240905762,0.07007694244384766,0.11830973625183105,0.13063573837280273,1.550079584121704,0.6807317733764648,0.06880903244018555,0.06761360168457031,0.06430482864379883,0.06965279579162598,0.08765363693237305 diff --git a/results/combined/merges_timed/davidmoten/geo.csv b/results/combined/merges_timed/davidmoten/geo.csv index 285d8d1153..97a7cb50dc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,True,True,True,10,32,133,3,True,10,Tests_passed,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,True,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,True,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,e907c6272ee7e4fa03cbc3df0d9460fb5af0ead7957e61ea2f6fef87f35b4ad2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Tests_passed,017d1dc473e42e9664eda365ecea2440c5d0042015fe51140b882ef3a323f62d,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,c480969ad07f1244756ee12b88b3c807d188afdab13e77fedc27d3a7bc5e3524,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,a873a3a7a1a35004c9b98209f625854de380bd78e159717d590b198fdbd88bb2,Tests_passed,303e20c8f5a4f9212fb1eb72d3a3478f596ae319a9c4a4c599a0c32d8b9cddc1,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,0.04286456108093262,0.042931318283081055,0.04335212707519531,0.013857126235961914,0.04061532020568848,0.0407261848449707,0.03599238395690918,0.21411800384521484,0.1702103614807129,1.520573377609253,0.40285563468933105,0.039408206939697266,0.0638890266418457,0.03976082801818848,0.06510186195373535,0.06370878219604492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,True,True,True,10,32,133,3,True,10,Tests_passed,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,True,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,True,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,e907c6272ee7e4fa03cbc3df0d9460fb5af0ead7957e61ea2f6fef87f35b4ad2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Tests_passed,017d1dc473e42e9664eda365ecea2440c5d0042015fe51140b882ef3a323f62d,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,c480969ad07f1244756ee12b88b3c807d188afdab13e77fedc27d3a7bc5e3524,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,a873a3a7a1a35004c9b98209f625854de380bd78e159717d590b198fdbd88bb2,Tests_passed,303e20c8f5a4f9212fb1eb72d3a3478f596ae319a9c4a4c599a0c32d8b9cddc1,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,0.04286456108093262,0.042931318283081055,0.04335212707519531,0.013857126235961914,0.04061532020568848,0.0407261848449707,0.03599238395690918,0.21411800384521484,0.1702103614807129,1.520573377609253,0.40285563468933105,0.039408206939697266,0.0638890266418457,0.03976082801818848,0.06510186195373535,0.06370878219604492,0.060820817947387695,0.06258893013000488,0.06170797348022461,0.06302118301391602,0.06119966506958008,0.060587406158447266,0.06101179122924805,0.1085653305053711,0.12002801895141602,1.6152207851409912,0.4799647331237793,0.062247514724731445,0.06288838386535645,0.06173253059387207,0.06089949607849121,0.06210756301879883 diff --git a/results/combined/merges_timed/davidmoten/rtree.csv b/results/combined/merges_timed/davidmoten/rtree.csv index 6c42799b03..de88230911 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,True,10,60,189,3,True,10,Tests_passed,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,True,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,True,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,0094c489e959cc1130a5d27c96da03b2a300638f995f381324193109ac25e500,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,b577b9c37444b7a59487e849168718e6fb0727c930787967ac96d61c5d87abc8,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,5dc6a52ee22b0b3700153695cc38860ddfc09c8b6ef39707dffec21f76d35a3a,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,0.013810157775878906,0.014359474182128906,0.014834880828857422,0.02181100845336914,0.015056610107421875,0.014359712600708008,0.014902591705322266,0.05412650108337402,0.12867259979248047,0.9283463954925537,0.8753993511199951,0.06305527687072754,0.05767631530761719,0.06424093246459961,0.064208984375,0.0638580322265625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,True,10,60,189,3,True,10,Tests_passed,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,True,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,True,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,0094c489e959cc1130a5d27c96da03b2a300638f995f381324193109ac25e500,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,b577b9c37444b7a59487e849168718e6fb0727c930787967ac96d61c5d87abc8,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,5dc6a52ee22b0b3700153695cc38860ddfc09c8b6ef39707dffec21f76d35a3a,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,0.013810157775878906,0.014359474182128906,0.014834880828857422,0.02181100845336914,0.015056610107421875,0.014359712600708008,0.014902591705322266,0.05412650108337402,0.12867259979248047,0.9283463954925537,0.8753993511199951,0.06305527687072754,0.05767631530761719,0.06424093246459961,0.064208984375,0.0638580322265625,0.06139492988586426,0.06367659568786621,0.05629324913024902,0.06555914878845215,0.06720733642578125,0.06545186042785645,0.0634303092956543,0.10577106475830078,0.14252758026123047,1.1288063526153564,1.0117571353912354,0.06403851509094238,0.0640110969543457,0.05614185333251953,0.06383752822875977,0.06445026397705078 diff --git a/results/combined/merges_timed/davidmoten/rxjava-extras.csv b/results/combined/merges_timed/davidmoten/rxjava-extras.csv index 345d387c97..194bceedd1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,False,True,3,3,17,2,True,3,Tests_passed,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,True,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,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,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,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,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,f4ee735a514a55e51ed3e203d4f446760882ac54625063407b7ce11e08bb945e,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,0.03865456581115723,0.03053450584411621,0.022022008895874023,0.013365745544433594,0.028805971145629883,0.040602922439575195,0.03810000419616699,0.16277170181274414,0.10243558883666992,0.5040750503540039,0.2559521198272705,0.028783559799194336,0.051661014556884766,0.02899909019470215,0.05179619789123535,0.052179574966430664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,False,True,3,3,17,2,True,3,Tests_passed,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,True,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,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,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,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,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,f4ee735a514a55e51ed3e203d4f446760882ac54625063407b7ce11e08bb945e,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,0.03865456581115723,0.03053450584411621,0.022022008895874023,0.013365745544433594,0.028805971145629883,0.040602922439575195,0.03810000419616699,0.16277170181274414,0.10243558883666992,0.5040750503540039,0.2559521198272705,0.028783559799194336,0.051661014556884766,0.02899909019470215,0.05179619789123535,0.052179574966430664,0.052033185958862305,0.05132579803466797,0.05114626884460449,0.052468061447143555,0.052458763122558594,0.051583051681518555,0.051059722900390625,0.08493733406066895,0.0876929759979248,0.5589554309844971,0.28295207023620605,0.052356719970703125,0.052309274673461914,0.0491940975189209,0.05211615562438965,0.0518345832824707 diff --git a/results/combined/merges_timed/davidmoten/rxjava-file.csv b/results/combined/merges_timed/davidmoten/rxjava-file.csv index d3d92015b6..1b2a14eb97 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,True,7,56,328,4,True,7,Tests_passed,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,True,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,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,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,Merge_failed,b1091c36b214f727494d072fb0fb16363840b8b280a27f7e7bbcfb0daa35860c,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,8c4f911e6423d025940686fb1e92601439b2b4943fc51c0c3032ee849164c7f7,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,b7f644244122a806bc2fd303bfe936972d7d4269cb368f2716121f0fbd0e05cc,Tests_failed,2d45b907e98eb96330ab0327e2195bb6fd2d110388255289f4237ce80bb6f05c,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,0.043610572814941406,0.04028034210205078,0.0408937931060791,0.013977289199829102,0.04272270202636719,0.009502649307250977,0.04327869415283203,0.29689812660217285,0.23575735092163086,1.725569725036621,0.35540294647216797,0.052114009857177734,0.07381725311279297,0.05069422721862793,0.07432317733764648,0.07355165481567383 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,True,7,56,328,4,True,7,Tests_passed,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,True,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,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,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,Merge_failed,b1091c36b214f727494d072fb0fb16363840b8b280a27f7e7bbcfb0daa35860c,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,8c4f911e6423d025940686fb1e92601439b2b4943fc51c0c3032ee849164c7f7,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,b7f644244122a806bc2fd303bfe936972d7d4269cb368f2716121f0fbd0e05cc,Tests_failed,2d45b907e98eb96330ab0327e2195bb6fd2d110388255289f4237ce80bb6f05c,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,4c72472123ef202688c97e63b118453065102e83454662fc2207cf09850f71ac,Merge_failed,fae51f9dd38805de14289c226f97c0a05e838cde579b19c5995a1ca1de7f1840,0.043610572814941406,0.04028034210205078,0.0408937931060791,0.013977289199829102,0.04272270202636719,0.009502649307250977,0.04327869415283203,0.29689812660217285,0.23575735092163086,1.725569725036621,0.35540294647216797,0.052114009857177734,0.07381725311279297,0.05069422721862793,0.07432317733764648,0.07355165481567383,0.07343363761901855,0.07480382919311523,0.07276225090026855,0.07538080215454102,0.07221269607543945,0.07378125190734863,0.07599210739135742,0.13606977462768555,0.1670703887939453,1.9846866130828857,0.45001745223999023,0.07355785369873047,0.07458114624023438,0.07338738441467285,0.07509160041809082,0.07457256317138672 diff --git a/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv b/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv index 80b23e24e1..3fcd59539f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,True,14,30,614,2,True,14,Tests_passed,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,True,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,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,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,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,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,03fa182ef0ca0fec73ec930360bf97f1f067d540666c0911e94dc1f530a5558a,Tests_failed,209eb0cb498ec444b4014d95591d086951b1ceae78f738bd77ec9af15a4cdfdb,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,0.05400848388671875,0.04473471641540527,0.04491877555847168,0.018125295639038086,0.05138516426086426,0.05712604522705078,0.0476224422454834,0.16247272491455078,0.10708856582641602,1.1559185981750488,0.38847923278808594,0.03479909896850586,0.06173086166381836,0.03554129600524902,0.06197381019592285,0.061678171157836914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,True,14,30,614,2,True,14,Tests_passed,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,True,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,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,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,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,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,03fa182ef0ca0fec73ec930360bf97f1f067d540666c0911e94dc1f530a5558a,Tests_failed,209eb0cb498ec444b4014d95591d086951b1ceae78f738bd77ec9af15a4cdfdb,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,0.05400848388671875,0.04473471641540527,0.04491877555847168,0.018125295639038086,0.05138516426086426,0.05712604522705078,0.0476224422454834,0.16247272491455078,0.10708856582641602,1.1559185981750488,0.38847923278808594,0.03479909896850586,0.06173086166381836,0.03554129600524902,0.06197381019592285,0.061678171157836914,0.06003379821777344,0.06074810028076172,0.06044340133666992,0.06334447860717773,0.06401968002319336,0.06303763389587402,0.061653852462768555,0.09706664085388184,0.0932624340057373,1.3775584697723389,0.46886253356933594,0.06022024154663086,0.06096196174621582,0.061089277267456055,0.060343265533447266,0.06239461898803711 diff --git a/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv b/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv index e7f7ebb0a4..ccdd943e07 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,True,3,8,673,2,True,3,Tests_passed,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,True,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,91825fc16de546044d6cbe1fdc600161b0e525f25a998de2521fc0633b61d602,Tests_passed,9093ca9e93cb6601ac44b3d04caf10935993f7afad5f300042ca868c925fbb72,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,00a82c9b07aeff6565ce8a8e53c1a1b42455b7f3b217c10d51c293dbb487e66e,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,9d3df5d63376bb617849c6f85e70c3a1b3a6e6a342448f78defd2ec4e23d332a,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,0.03907155990600586,0.04024505615234375,0.04071235656738281,0.01288294792175293,0.040732383728027344,0.03822803497314453,0.039261579513549805,0.16308999061584473,0.10891222953796387,0.668973445892334,0.39299464225769043,0.04648423194885254,0.04126620292663574,0.040023088455200195,0.045156002044677734,0.04214763641357422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,True,3,8,673,2,True,3,Tests_passed,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,True,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,91825fc16de546044d6cbe1fdc600161b0e525f25a998de2521fc0633b61d602,Tests_passed,9093ca9e93cb6601ac44b3d04caf10935993f7afad5f300042ca868c925fbb72,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,00a82c9b07aeff6565ce8a8e53c1a1b42455b7f3b217c10d51c293dbb487e66e,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,9d3df5d63376bb617849c6f85e70c3a1b3a6e6a342448f78defd2ec4e23d332a,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,0.03907155990600586,0.04024505615234375,0.04071235656738281,0.01288294792175293,0.040732383728027344,0.03822803497314453,0.039261579513549805,0.16308999061584473,0.10891222953796387,0.668973445892334,0.39299464225769043,0.04648423194885254,0.04126620292663574,0.040023088455200195,0.045156002044677734,0.04214763641357422,0.04439139366149902,0.04409289360046387,0.04323172569274902,0.04427790641784668,0.11635446548461914,0.11330080032348633,0.11443042755126953,0.14618945121765137,0.15064382553100586,0.822335958480835,0.48863792419433594,0.04383563995361328,0.04477858543395996,0.04445290565490723,0.04265785217285156,0.04392242431640625 diff --git a/results/combined/merges_timed/dbaeli/conf4j.csv b/results/combined/merges_timed/dbaeli/conf4j.csv index 56b2afd517..e8ba04f9f2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,True,,True,13,38,,3,True,13,Tests_passed,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,True,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,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,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,620b0d51d9c1633262258943af2bbe82adfad7c81a73851961a0f202c053f2ba,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,0.05125594139099121,0.05033230781555176,0.04727458953857422,0.016778945922851562,0.04987144470214844,0.044879913330078125,0.04539823532104492,0.23071599006652832,0.16560149192810059,0.4476356506347656,0.32170701026916504,0.031972408294677734,0.07671666145324707,0.03155946731567383,0.07564687728881836,0.07571697235107422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,True,,True,13,38,,3,True,13,Tests_passed,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,True,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,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,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,620b0d51d9c1633262258943af2bbe82adfad7c81a73851961a0f202c053f2ba,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,b701f0dfc80debdac7810502ab2247fd16dd6f5eebff08381d0963c572d4253a,Tests_passed,dfae38e5fc0b03ceb9273a3c5e361cfc77ae83776f535e0941b4f5977b614f61,0.05125594139099121,0.05033230781555176,0.04727458953857422,0.016778945922851562,0.04987144470214844,0.044879913330078125,0.04539823532104492,0.23071599006652832,0.16560149192810059,0.4476356506347656,0.32170701026916504,0.031972408294677734,0.07671666145324707,0.03155946731567383,0.07564687728881836,0.07571697235107422,0.07216572761535645,0.07227087020874023,0.07140326499938965,0.07336592674255371,0.07190656661987305,0.07315421104431152,0.07298135757446289,0.1187734603881836,0.12671113014221191,0.4738335609436035,0.35918641090393066,0.07265782356262207,0.07273054122924805,0.07169628143310547,0.073486328125,0.07210111618041992 diff --git a/results/combined/merges_timed/dbaeli/ez18n.csv b/results/combined/merges_timed/dbaeli/ez18n.csv index 8204fc4ec5..a288817884 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,,True,20,12,,2,True,20,Tests_passed,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,True,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,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,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,b1d0dd7d17755eafa95c0a9f032fb08b5085ff142247013be273439a2322d254,Tests_passed,bb56b5b3ee56d3bdec1cd15f72f2910e4e3b934fc3f779300c2e93c341b24eba,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,0.05963587760925293,0.059424400329589844,0.06212806701660156,0.06724238395690918,0.06174588203430176,0.06126809120178223,0.061420440673828125,0.13104963302612305,0.11665463447570801,0.8256447315216064,0.3758549690246582,0.11972975730895996,0.15429329872131348,0.12122988700866699,0.14095664024353027,0.15045380592346191 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,,True,20,12,,2,True,20,Tests_passed,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,True,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,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,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,b1d0dd7d17755eafa95c0a9f032fb08b5085ff142247013be273439a2322d254,Tests_passed,bb56b5b3ee56d3bdec1cd15f72f2910e4e3b934fc3f779300c2e93c341b24eba,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,Tests_passed,1ee3d62f0751df512ac2c4d74a669df16edc95f7f536393ef10a4851de9f70ee,0.05963587760925293,0.059424400329589844,0.06212806701660156,0.06724238395690918,0.06174588203430176,0.06126809120178223,0.061420440673828125,0.13104963302612305,0.11665463447570801,0.8256447315216064,0.3758549690246582,0.11972975730895996,0.15429329872131348,0.12122988700866699,0.14095664024353027,0.15045380592346191,0.1412208080291748,0.14009833335876465,0.1408524513244629,0.13599109649658203,0.14213037490844727,0.13853669166564941,0.13579511642456055,0.21475625038146973,0.17223167419433594,0.8242664337158203,0.44808363914489746,0.13799142837524414,0.13784480094909668,0.14059686660766602,0.1408383846282959,0.13652396202087402 diff --git a/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv b/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv index dbf73f0c6a..b1506951f4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,False,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,True,3.0,2,3.0,7,True,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,True,8,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,d6f93781b321cc7eba5ea8a390827b10594ce08f984d0cf4c21f2a122280c2d6,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,090315ad102c58c12a8f8d13f21d0d9ba88f92e59028ccd564166869b10e0528,Tests_failed,cee5524ee203680bc18278a8c32e0f6b06bf814b8ea3412484640bd2c6d2752e,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,0.010861873626708984,0.011110305786132812,0.012339353561401367,0.01821446418762207,0.012198448181152344,0.012130498886108398,0.012181758880615234,0.03583192825317383,0.06681966781616211,1.892404317855835,0.5608711242675781,0.0349879264831543,0.05980062484741211,0.035454750061035156,0.061904191970825195,0.06333494186401367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,False,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,True,3.0,2,3.0,7,True,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,True,8,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,d6f93781b321cc7eba5ea8a390827b10594ce08f984d0cf4c21f2a122280c2d6,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,090315ad102c58c12a8f8d13f21d0d9ba88f92e59028ccd564166869b10e0528,Tests_failed,cee5524ee203680bc18278a8c32e0f6b06bf814b8ea3412484640bd2c6d2752e,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,0.010861873626708984,0.011110305786132812,0.012339353561401367,0.01821446418762207,0.012198448181152344,0.012130498886108398,0.012181758880615234,0.03583192825317383,0.06681966781616211,1.892404317855835,0.5608711242675781,0.0349879264831543,0.05980062484741211,0.035454750061035156,0.061904191970825195,0.06333494186401367,0.05740165710449219,0.05985450744628906,0.061113595962524414,0.06105160713195801,0.05986952781677246,0.059722900390625,0.06093788146972656,0.08864903450012207,0.0913996696472168,1.9718737602233887,0.6045374870300293,0.060655832290649414,0.05962324142456055,0.05901503562927246,0.05789899826049805,0.05859041213989258 diff --git a/results/combined/merges_timed/dblock/oshi.csv b/results/combined/merges_timed/dblock/oshi.csv index b8157b5ecd..371922e1d2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,True,54,404,5892,5,True,54,Tests_passed,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,True,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,752283a4d00ec1c14ec57425583a37b58495e82588c6f594a7e18757d7b8bb63,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Tests_failed,039615f08f5c744ddfe65fefcac754882f486958f64816c2a7f73a9d6e572ce1,Merge_failed,0b18a179244b7ab29a5afa06023b6802b1f50d9dc5caca781bb4edae475b87ae,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,c96b013b15ac2dabddbb6add9b938fbf938cef2c3e978c0abcdb1016d72887c8,Merge_failed,9e47187ad823b1e23c34c70422354db39581006e930ccb5b895e7e8bd9548fa4,Merge_failed,93e7d934396e4480f31a1b719dc865cbe411b6006a676e983574e09cacdca0f4,Tests_failed,bd0f7a6cc618fc7c448652cd0f61aa1bdb6aebf322fb0d60f14e50bbf1398770,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,0.047088623046875,0.04172015190124512,0.04158306121826172,0.020843505859375,0.050446271896362305,0.05903506278991699,0.05275845527648926,0.39342737197875977,0.31026434898376465,2.633826732635498,3.197295904159546,0.09599423408508301,0.10306501388549805,0.08639359474182129,0.10576343536376953,0.10348868370056152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,True,54,404,5892,5,True,54,Tests_passed,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,True,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,752283a4d00ec1c14ec57425583a37b58495e82588c6f594a7e18757d7b8bb63,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Tests_failed,039615f08f5c744ddfe65fefcac754882f486958f64816c2a7f73a9d6e572ce1,Merge_failed,0b18a179244b7ab29a5afa06023b6802b1f50d9dc5caca781bb4edae475b87ae,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,c96b013b15ac2dabddbb6add9b938fbf938cef2c3e978c0abcdb1016d72887c8,Merge_failed,9e47187ad823b1e23c34c70422354db39581006e930ccb5b895e7e8bd9548fa4,Merge_failed,93e7d934396e4480f31a1b719dc865cbe411b6006a676e983574e09cacdca0f4,Tests_failed,bd0f7a6cc618fc7c448652cd0f61aa1bdb6aebf322fb0d60f14e50bbf1398770,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,004a2131e8d82b134fa97753ff0bcdc74211126f6f936876b0f92b0cd763614f,Merge_failed,bc58f16ee8756990161f8133e91f98342f0d1a0b4df68ddb4eb4099e8e9e9936,0.047088623046875,0.04172015190124512,0.04158306121826172,0.020843505859375,0.050446271896362305,0.05903506278991699,0.05275845527648926,0.39342737197875977,0.31026434898376465,2.633826732635498,3.197295904159546,0.09599423408508301,0.10306501388549805,0.08639359474182129,0.10576343536376953,0.10348868370056152,0.10039806365966797,0.09670066833496094,0.10082888603210449,0.09723973274230957,0.10075187683105469,0.09786868095397949,0.09854292869567871,0.17975902557373047,0.21085882186889648,2.756240129470825,3.4808197021484375,0.10082149505615234,0.10143542289733887,0.10203313827514648,0.09789896011352539,0.10073328018188477 diff --git a/results/combined/merges_timed/dcm4che/dcm4che.csv b/results/combined/merges_timed/dcm4che/dcm4che.csv index 7e295d4d59..4dc03b82fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -57,refs/heads/master,af57bb9f016f2b44ecbb7650d26ad18591158627,887dc0240c2406c7f0f70f34851011067989e02a,4c9b37d5dc57cd421dcaee476b58a2360886d7c3,,True,True,True,2,5,14,4,True,4,Tests_passed,e4b63575d285f78e3b5cc7fbdc4923dede25fe523732225c66f1ad2dbb8e6837,True,Tests_passed,ba35885f07f3bf5d7f98fadd2cf624fe47bfba3aa2b308a10120bf55ca920d9e,True,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,c2067387f6db90ebe7dac65cd0239f5c851d5d0168102cc71d032e9e7a326bb7,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,45e6c58e3714fcd79ecb0f67ddea1d7222bed4d3ecea2842734d93bec648dff0,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,2a4d44c597bda313b668893ad5fd0db1cdd467e701ca93e4b24b5f6250908d8e,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,1b1da6a05f42ef2c45d5f209ca65b759f3e558e130477d8261b43ab05fa926a9,Tests_failed,8e7cb340d4bce692808cf96ccf41286e787ff7599f5c370a5411e27f0eee6b7b,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,0.013808488845825195,0.0137176513671875,0.014709949493408203,0.022387981414794922,0.014685869216918945,0.014853954315185547,0.015162229537963867,0.08209490776062012,0.07277774810791016,0.8650610446929932,0.5312294960021973,0.051705360412597656,0.05068850517272949,0.05103921890258789,0.051883697509765625,0.0515286922454834 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +57,refs/heads/master,af57bb9f016f2b44ecbb7650d26ad18591158627,887dc0240c2406c7f0f70f34851011067989e02a,4c9b37d5dc57cd421dcaee476b58a2360886d7c3,,True,True,True,2,5,14,4,True,4,Tests_passed,e4b63575d285f78e3b5cc7fbdc4923dede25fe523732225c66f1ad2dbb8e6837,True,Tests_passed,ba35885f07f3bf5d7f98fadd2cf624fe47bfba3aa2b308a10120bf55ca920d9e,True,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,c2067387f6db90ebe7dac65cd0239f5c851d5d0168102cc71d032e9e7a326bb7,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,45e6c58e3714fcd79ecb0f67ddea1d7222bed4d3ecea2842734d93bec648dff0,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,2a4d44c597bda313b668893ad5fd0db1cdd467e701ca93e4b24b5f6250908d8e,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,1b1da6a05f42ef2c45d5f209ca65b759f3e558e130477d8261b43ab05fa926a9,Tests_failed,8e7cb340d4bce692808cf96ccf41286e787ff7599f5c370a5411e27f0eee6b7b,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,0.013808488845825195,0.0137176513671875,0.014709949493408203,0.022387981414794922,0.014685869216918945,0.014853954315185547,0.015162229537963867,0.08209490776062012,0.07277774810791016,0.8650610446929932,0.5312294960021973,0.051705360412597656,0.05068850517272949,0.05103921890258789,0.051883697509765625,0.0515286922454834,0.048844099044799805,0.0501551628112793,0.049551963806152344,0.05145907402038574,0.0503840446472168,0.05009913444519043,0.05133342742919922,0.08943915367126465,0.08875083923339844,0.9409687519073486,0.6040472984313965,0.04993772506713867,0.05023384094238281,0.049768686294555664,0.05008554458618164,0.05049920082092285 diff --git a/results/combined/merges_timed/deathmarine/luyten.csv b/results/combined/merges_timed/deathmarine/luyten.csv index 2be8a3641f..db0bd93d79 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,Tests_passed,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,True,11,84,332,6,True,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,True,11,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,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,Tests_failed,f3b854b72f89296bd08ddfae265418b1bb1b80df9e7b8c532d241e734fad0497,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,930abefa41a0af641a94f8649830bd4117a3b76e462f59b308e1f5d62ca4d87e,Merge_failed,38ad9e9ddc15f3d6014dd0c4c71ff0f6fe69de05a3b00a4bb09e996109fba501,Tests_passed,b37e88f78a925508c2e1aa2309947d1d1a8ba0ad04f3e446bc0c191a1cf914e3,Tests_failed,72aed55e7e9d9a82b5b6616fcb2f34a49fc788863eeace963d17f022db573801,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.02299666404724121,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.32177090644836426,5.275756359100342,0.5271003246307373,0.06124138832092285,0.13989686965942383,0.05304455757141113,0.139631986618042,0.14129924774169922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,Tests_passed,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,True,11,84,332,6,True,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,True,11,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,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,Tests_failed,f3b854b72f89296bd08ddfae265418b1bb1b80df9e7b8c532d241e734fad0497,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,930abefa41a0af641a94f8649830bd4117a3b76e462f59b308e1f5d62ca4d87e,Merge_failed,38ad9e9ddc15f3d6014dd0c4c71ff0f6fe69de05a3b00a4bb09e996109fba501,Tests_passed,b37e88f78a925508c2e1aa2309947d1d1a8ba0ad04f3e446bc0c191a1cf914e3,Tests_failed,72aed55e7e9d9a82b5b6616fcb2f34a49fc788863eeace963d17f022db573801,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,Merge_failed,893f0b7979a0a34860aaa55e1c65890852b88dd3e8ab59487f37d067ff6caa9b,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.02299666404724121,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.32177090644836426,5.275756359100342,0.5271003246307373,0.06124138832092285,0.13989686965942383,0.05304455757141113,0.139631986618042,0.14129924774169922,0.13521385192871094,0.13283276557922363,0.13245058059692383,0.1339111328125,0.1319715976715088,0.13558387756347656,0.1344435214996338,0.23444390296936035,0.2610456943511963,5.052151441574097,0.666449785232544,0.12739825248718262,0.13240861892700195,0.13090276718139648,0.12854790687561035,0.13145017623901367 diff --git a/results/combined/merges_timed/deemopen/zkui.csv b/results/combined/merges_timed/deemopen/zkui.csv index f6f25e06e4..62811408f5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,True,19,79,508,3,True,19,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,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,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,74031a6c6ed82066c68b6b6688063c2e59410b8178ecd1428ecc83dc785ff02e,Tests_failed,e80c0dc022d42ba9e6a135701478116b1daf7cefcd8f8b345929e270e0c319ce,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.02491021156311035,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.12610960006713867,1.2856645584106445,0.38831377029418945,0.05028104782104492,0.09110522270202637,0.05251622200012207,0.09014034271240234,0.09314155578613281 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,True,19,79,508,3,True,19,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,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,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,74031a6c6ed82066c68b6b6688063c2e59410b8178ecd1428ecc83dc785ff02e,Tests_failed,e80c0dc022d42ba9e6a135701478116b1daf7cefcd8f8b345929e270e0c319ce,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,Tests_failed,c29a700ba1a9a0a3d1ffc50f6b0deebb0960101042b5302f442f52aacb77c659,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.02491021156311035,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.12610960006713867,1.2856645584106445,0.38831377029418945,0.05028104782104492,0.09110522270202637,0.05251622200012207,0.09014034271240234,0.09314155578613281,0.09121394157409668,0.09062600135803223,0.09245657920837402,0.09185409545898438,0.0903940200805664,0.09089779853820801,0.09211230278015137,0.14562177658081055,0.15148401260375977,1.5901925563812256,0.5012316703796387,0.09076333045959473,0.08899521827697754,0.09181761741638184,0.09133028984069824,0.08890342712402344 diff --git a/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv b/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv index 97b0c93467..020cc79404 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,True,8,22,273,2,True,8,Tests_passed,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,True,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,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,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,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,ffaf08a39845c07f3cb3f0f01b5c65cd5b674ff9e49ed9da68df9bf175737bb8,Tests_passed,aa2e53cedcd87bc90c62d15536d57e26e36ac25258d9704e2cf97432a6116042,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,0.04255342483520508,0.0408320426940918,0.037216901779174805,0.024491310119628906,0.0455479621887207,0.045958518981933594,0.04616999626159668,0.1689751148223877,0.07167863845825195,0.6277680397033691,0.3384857177734375,0.046117544174194336,0.07291507720947266,0.04741406440734863,0.07156252861022949,0.06792020797729492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,True,8,22,273,2,True,8,Tests_passed,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,True,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,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,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,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,ffaf08a39845c07f3cb3f0f01b5c65cd5b674ff9e49ed9da68df9bf175737bb8,Tests_passed,aa2e53cedcd87bc90c62d15536d57e26e36ac25258d9704e2cf97432a6116042,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,0.04255342483520508,0.0408320426940918,0.037216901779174805,0.024491310119628906,0.0455479621887207,0.045958518981933594,0.04616999626159668,0.1689751148223877,0.07167863845825195,0.6277680397033691,0.3384857177734375,0.046117544174194336,0.07291507720947266,0.04741406440734863,0.07156252861022949,0.06792020797729492,0.06734299659729004,0.06800103187561035,0.054971933364868164,0.0713965892791748,0.07256841659545898,0.05407381057739258,0.07190752029418945,0.11000990867614746,0.10464644432067871,0.6744468212127686,0.38440585136413574,0.06958937644958496,0.07002067565917969,0.07091879844665527,0.06816720962524414,0.06954550743103027 diff --git a/results/combined/merges_timed/dfabulich/sitemapgen4j.csv b/results/combined/merges_timed/dfabulich/sitemapgen4j.csv index 073a22cb7c..5ba0280946 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,True,17,81,631,4,True,17,Tests_passed,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,True,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,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,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,39108bac8187144304eb45b55b94c594841c150bfce2327c7898b03bf04bbe6f,Merge_timedout,,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,0.0481715202331543,0.04665827751159668,0.04548931121826172,0.01863384246826172,0.04624128341674805,0.050652503967285156,0.05146479606628418,0.31298828125,0.22630023956298828,2.1235806941986084,-1.0,0.03318595886230469,0.09781885147094727,0.033818960189819336,0.1001591682434082,0.09964632987976074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,True,17,81,631,4,True,17,Tests_passed,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,True,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,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,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,39108bac8187144304eb45b55b94c594841c150bfce2327c7898b03bf04bbe6f,Merge_timedout,,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,bbd31d77d82c6e6dc50430c3e4efbdf2fb3fef784d330056b8e746c6633d79dd,Tests_passed,6f8b7654edac8582d9de8b0198966a8b250b427b0edea58e775d0f53ea02dd75,0.0481715202331543,0.04665827751159668,0.04548931121826172,0.01863384246826172,0.04624128341674805,0.050652503967285156,0.05146479606628418,0.31298828125,0.22630023956298828,2.1235806941986084,-1.0,0.03318595886230469,0.09781885147094727,0.033818960189819336,0.1001591682434082,0.09964632987976074,0.09483218193054199,0.09809708595275879,0.09669160842895508,0.09857773780822754,0.09724569320678711,0.09542179107666016,0.09906888008117676,0.1658306121826172,0.18014287948608398,2.507768392562866,-1.0,0.09411764144897461,0.09415936470031738,0.0926675796508789,0.09297037124633789,0.08980393409729004 diff --git a/results/combined/merges_timed/dgarijo/widoco.csv b/results/combined/merges_timed/dgarijo/widoco.csv index 6f699a7a6a..4e0cefbfbb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,True,11,123,885.0,2,True,11,Tests_passed,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,True,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,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,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,26d1f02d98ed6f112241e98d05088adf6467ea4e4d3cd0bff6712acaaa55fd8a,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Tests_failed,1206549c6aec96aab6e7e3ee2460bb5eb85a3a1dd4e6b45cd25a07acaf93776d,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,0.043245553970336914,0.027059078216552734,0.01644158363342285,0.021825075149536133,0.015887022018432617,0.021167755126953125,0.06280088424682617,0.21898579597473145,0.12728095054626465,0.0517733097076416,0.7047333717346191,0.05277132987976074,0.050589799880981445,0.05846595764160156,0.06171822547912598,0.05314493179321289 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,True,11,123,885.0,2,True,11,Tests_passed,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,True,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,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,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,26d1f02d98ed6f112241e98d05088adf6467ea4e4d3cd0bff6712acaaa55fd8a,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Tests_failed,1206549c6aec96aab6e7e3ee2460bb5eb85a3a1dd4e6b45cd25a07acaf93776d,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,0.043245553970336914,0.027059078216552734,0.01644158363342285,0.021825075149536133,0.015887022018432617,0.021167755126953125,0.06280088424682617,0.21898579597473145,0.12728095054626465,0.0517733097076416,0.7047333717346191,0.05277132987976074,0.050589799880981445,0.05846595764160156,0.06171822547912598,0.05314493179321289,0.06141328811645508,0.052188873291015625,0.06176638603210449,0.05120110511779785,0.06446266174316406,0.06156492233276367,0.05940508842468262,0.09655261039733887,0.09906244277954102,0.0805654525756836,0.8421664237976074,0.06599736213684082,0.062300920486450195,0.0591273307800293,0.062242984771728516,0.051514387130737305 diff --git a/results/combined/merges_timed/dgradecak/alfresco-mvc.csv b/results/combined/merges_timed/dgradecak/alfresco-mvc.csv index 78d4a66a1b..ede2657b5c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,True,47,101,1976,7,True,47,Tests_passed,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,True,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,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,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,Merge_failed,7c42a4fabf9c2f9f1af21ecb2d3ddaf57761bfa9e836b79318194103a4fbf120,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,17ab207d87d48ac36772b56e2e3d82a65d9118b0d044aa8c4163b8654cb93655,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,71da3d6498df4fd7e0e403552fbabbf6a1a705edd870a19807ed669709126610,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,0.04387259483337402,0.0507349967956543,0.052436113357543945,0.018939495086669922,0.04560565948486328,0.048725128173828125,0.05033588409423828,0.4705078601837158,0.3805997371673584,0.957942008972168,0.3612101078033447,0.09303689002990723,0.09410429000854492,0.09095168113708496,0.09509897232055664,0.0930640697479248 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,True,47,101,1976,7,True,47,Tests_passed,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,True,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,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,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,Merge_failed,7c42a4fabf9c2f9f1af21ecb2d3ddaf57761bfa9e836b79318194103a4fbf120,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,17ab207d87d48ac36772b56e2e3d82a65d9118b0d044aa8c4163b8654cb93655,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,71da3d6498df4fd7e0e403552fbabbf6a1a705edd870a19807ed669709126610,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,0.04387259483337402,0.0507349967956543,0.052436113357543945,0.018939495086669922,0.04560565948486328,0.048725128173828125,0.05033588409423828,0.4705078601837158,0.3805997371673584,0.957942008972168,0.3612101078033447,0.09303689002990723,0.09410429000854492,0.09095168113708496,0.09509897232055664,0.0930640697479248,0.09374403953552246,0.09445571899414062,0.09579968452453613,0.09336733818054199,0.09718632698059082,0.09644842147827148,0.09471464157104492,0.2026512622833252,0.27674055099487305,1.1267151832580566,0.5005075931549072,0.09522485733032227,0.09621238708496094,0.09597325325012207,0.09660196304321289,0.0940704345703125 diff --git a/results/combined/merges_timed/dieselpoint/norm.csv b/results/combined/merges_timed/dieselpoint/norm.csv index 3b5400dcf9..d1f9fec4ff 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,True,10,23,1228,2,True,10,Tests_passed,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,True,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,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,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Tests_failed,85c7c80c4bf82aafdf00a83093f1074e8474d8e7edf2aa40569f2defaeaf0259,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,d4af3fa561fed37b5e707d1518bb1b254bdc2abb84afdfcb6453f49d328f8fa9,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,860b09283896e67b87e38fac862e987c8867975cd2fd824d99a60f1675cc48d8,Tests_failed,0fa04fd268ab2769b59ae3f23726406a0ea34bcf4d90a8e8bfc0cea49f4a1917,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,0.009078264236450195,0.009577274322509766,0.008986234664916992,0.013218402862548828,0.009011268615722656,0.008988142013549805,0.009605169296264648,0.03590869903564453,0.06898260116577148,0.9315841197967529,0.4788320064544678,0.03943181037902832,0.04004240036010742,0.03948163986206055,0.04121065139770508,0.040984392166137695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,True,10,23,1228,2,True,10,Tests_passed,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,True,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,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,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Tests_failed,85c7c80c4bf82aafdf00a83093f1074e8474d8e7edf2aa40569f2defaeaf0259,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,d4af3fa561fed37b5e707d1518bb1b254bdc2abb84afdfcb6453f49d328f8fa9,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,860b09283896e67b87e38fac862e987c8867975cd2fd824d99a60f1675cc48d8,Tests_failed,0fa04fd268ab2769b59ae3f23726406a0ea34bcf4d90a8e8bfc0cea49f4a1917,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,0.009078264236450195,0.009577274322509766,0.008986234664916992,0.013218402862548828,0.009011268615722656,0.008988142013549805,0.009605169296264648,0.03590869903564453,0.06898260116577148,0.9315841197967529,0.4788320064544678,0.03943181037902832,0.04004240036010742,0.03948163986206055,0.04121065139770508,0.040984392166137695,0.039603233337402344,0.04030776023864746,0.03952145576477051,0.04004049301147461,0.03898763656616211,0.03963327407836914,0.039632558822631836,0.07073760032653809,0.07444477081298828,0.9125127792358398,0.5391159057617188,0.0390470027923584,0.03993725776672363,0.04004931449890137,0.03965568542480469,0.039980173110961914 diff --git a/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv b/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv index cce5be67f5..e95ce85f05 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,True,True,True,72,492,20450,2,True,72,Tests_passed,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,True,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,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,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Tests_failed,a2eb7275b4ddfc74a98d77ae9671fdc3633cdff589a006a8ed1edfeed86618a6,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,080a9fd2bd51608314171c506699f555842691fc3f958cee62af5f35f7ab2129,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,33e519d27c306af0cd912c1f26ee4ce78c1d502b96af64df737777d937f49cb3,Tests_failed,bebd89f38c926c7d21959cbfa5d6b0f4f30d80dbff1e2cae1bb69b096ed6612c,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,0.04504036903381348,0.04452061653137207,0.05915117263793945,0.030402183532714844,0.04470467567443848,0.04290938377380371,0.04634451866149902,0.17945146560668945,0.10410213470458984,1.5442256927490234,7.278707027435303,0.06096291542053223,0.06091928482055664,0.05968189239501953,0.06725049018859863,0.062360286712646484 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,True,True,True,72,492,20450,2,True,72,Tests_passed,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,True,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,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,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Tests_failed,a2eb7275b4ddfc74a98d77ae9671fdc3633cdff589a006a8ed1edfeed86618a6,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,080a9fd2bd51608314171c506699f555842691fc3f958cee62af5f35f7ab2129,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,33e519d27c306af0cd912c1f26ee4ce78c1d502b96af64df737777d937f49cb3,Tests_failed,bebd89f38c926c7d21959cbfa5d6b0f4f30d80dbff1e2cae1bb69b096ed6612c,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,0.04504036903381348,0.04452061653137207,0.05915117263793945,0.030402183532714844,0.04470467567443848,0.04290938377380371,0.04634451866149902,0.17945146560668945,0.10410213470458984,1.5442256927490234,7.278707027435303,0.06096291542053223,0.06091928482055664,0.05968189239501953,0.06725049018859863,0.062360286712646484,0.06665611267089844,0.06816530227661133,0.06836605072021484,0.06578946113586426,0.0773477554321289,0.07754755020141602,0.06940317153930664,0.10970950126647949,0.10907292366027832,1.731623649597168,7.509595632553101,0.06291842460632324,0.06482648849487305,0.06534504890441895,0.06449317932128906,0.06439661979675293 diff --git a/results/combined/merges_timed/digital-preservation/droid.csv b/results/combined/merges_timed/digital-preservation/droid.csv index a6f929cb96..46be2c241a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,Tests_passed,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,True,28.0,59,251.0,49,True,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,True,53,True,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,b7a3409120feffe51b50bccb9cd6d8d39910c63944ac25316e8b39934287d0cb,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,f92ef23dd33928815cbf1eaf5e17248a00ec1f1963b622e9037c0e4639e0a7b9,Merge_failed,e2775ca22cdf32f57f4d533a3a37214ac23e81f4d0af74fdb674e0789a10e081,Merge_failed,e2775ca22cdf32f57f4d533a3a37214ac23e81f4d0af74fdb674e0789a10e081,Merge_failed,ca2d2e7494316f53dd66d1251809e0a6f35e752ac5495b12d8fb67005d17162f,Merge_failed,0b86b56bd2720a36bf09c5400a07acd25a771590aca50f267a7487fcbd550359,Merge_failed,80f570a882a6eecaf7e35c50b17f21f79a9137273d320ac7fa24c76eb0454a46,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,0.0714263916015625,0.07446050643920898,0.08878707885742188,0.034171342849731445,0.09215831756591797,0.08580183982849121,0.07419657707214355,1.6202576160430908,1.4103388786315918,0.06419563293457031,0.8744063377380371,0.2845149040222168,0.36111998558044434,0.28641819953918457,0.3482785224914551,0.3455047607421875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,Tests_passed,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,True,28.0,59,251.0,49,True,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,True,53,True,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,b7a3409120feffe51b50bccb9cd6d8d39910c63944ac25316e8b39934287d0cb,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,f92ef23dd33928815cbf1eaf5e17248a00ec1f1963b622e9037c0e4639e0a7b9,Merge_failed,e2775ca22cdf32f57f4d533a3a37214ac23e81f4d0af74fdb674e0789a10e081,Merge_failed,e2775ca22cdf32f57f4d533a3a37214ac23e81f4d0af74fdb674e0789a10e081,Merge_failed,ca2d2e7494316f53dd66d1251809e0a6f35e752ac5495b12d8fb67005d17162f,Merge_failed,0b86b56bd2720a36bf09c5400a07acd25a771590aca50f267a7487fcbd550359,Merge_failed,80f570a882a6eecaf7e35c50b17f21f79a9137273d320ac7fa24c76eb0454a46,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,832b6e9e1be6f372471b2df489ed827fcd60eec7676a061fa9046acf6c585d52,Merge_failed,2ad18767abaf2b7ac0989b98d65d62e027b00a2e583ece5a9fc9c222ca7d21f9,0.0714263916015625,0.07446050643920898,0.08878707885742188,0.034171342849731445,0.09215831756591797,0.08580183982849121,0.07419657707214355,1.6202576160430908,1.4103388786315918,0.06419563293457031,0.8744063377380371,0.2845149040222168,0.36111998558044434,0.28641819953918457,0.3482785224914551,0.3455047607421875,0.33727335929870605,0.3308417797088623,0.3350248336791992,0.3258392810821533,0.3282444477081299,0.3307230472564697,0.3372623920440674,0.7218799591064453,0.9307637214660645,0.3488295078277588,1.2409024238586426,0.330188512802124,0.3360588550567627,0.3358638286590576,0.3361079692840576,0.3273320198059082 diff --git a/results/combined/merges_timed/dius/java-faker.csv b/results/combined/merges_timed/dius/java-faker.csv index 7cd3055038..840161572b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,Tests_passed,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,True,21,35,303.0,5,True,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,True,22,True,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,b743d5030d0e1af0cd68d4d5e7ff09b811eb07ffe10e23aea72c75cea7e13b5f,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Tests_failed,db7160ae3936ebe64530509b4545bab72dc58ab63d665b23c4e84d6fb45b9eed,Merge_failed,ea6280b4c771aba4371a4303c2ff1c16e8d911633b421769871f078c1f0e17cf,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,ab8e7b5a9162ac9b85c7c12b09bfa1d846efba5364dd51a10cd6d59f4626d713,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Tests_failed,db7160ae3936ebe64530509b4545bab72dc58ab63d665b23c4e84d6fb45b9eed,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.017921924591064453,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.2385845184326172,1.9065899848937988,0.5136618614196777,0.060187578201293945,0.0779726505279541,0.05653715133666992,0.07807040214538574,0.07773923873901367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,Tests_passed,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,True,21,35,303.0,5,True,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,True,22,True,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,b743d5030d0e1af0cd68d4d5e7ff09b811eb07ffe10e23aea72c75cea7e13b5f,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Tests_failed,db7160ae3936ebe64530509b4545bab72dc58ab63d665b23c4e84d6fb45b9eed,Merge_failed,ea6280b4c771aba4371a4303c2ff1c16e8d911633b421769871f078c1f0e17cf,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,ab8e7b5a9162ac9b85c7c12b09bfa1d846efba5364dd51a10cd6d59f4626d713,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Tests_failed,db7160ae3936ebe64530509b4545bab72dc58ab63d665b23c4e84d6fb45b9eed,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.017921924591064453,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.2385845184326172,1.9065899848937988,0.5136618614196777,0.060187578201293945,0.0779726505279541,0.05653715133666992,0.07807040214538574,0.07773923873901367,0.07526278495788574,0.07492589950561523,0.0747075080871582,0.07448649406433105,0.07610821723937988,0.07464766502380371,0.074554443359375,0.14060544967651367,0.17010736465454102,1.9288196563720703,0.579200267791748,0.07654643058776855,0.07619214057922363,0.0757761001586914,0.07446599006652832,0.07480716705322266 diff --git a/results/combined/merges_timed/dkunzler/esperandro.csv b/results/combined/merges_timed/dkunzler/esperandro.csv index 0acf6cfa13..4b4545aa3f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,Tests_passed,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,True,63,294,1208,16,True,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,True,68,True,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,d733da41ac521e1c851db1807df4390ad8013cae50f7ac93420671b14c592d36,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,Merge_failed,060fea77f82b743a31445d3f5b0cdb8937db8507688a31a3348ba7609f5d5d8e,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,b703207acd5a2d153f3dfe89d1d9a6385c0ca151b1d322753158c08f68624a06,Merge_failed,9cb7a0f731b5d16ad13bd2bad22a48208631d06bbf1fc7312219273b373149f9,Merge_failed,3f0cf12e13fd5c8c40b4ee127fa20ec926b90b34316300d2038b770bfd23152e,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,0.013509511947631836,0.01413869857788086,0.014510393142700195,0.020381450653076172,0.015007972717285156,0.015017032623291016,0.015179634094238281,0.14395380020141602,0.571819543838501,0.4676089286804199,1.5968842506408691,0.14975357055664062,0.15162873268127441,0.1745905876159668,0.21990060806274414,0.22215771675109863 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,Tests_passed,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,True,63,294,1208,16,True,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,True,68,True,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,d733da41ac521e1c851db1807df4390ad8013cae50f7ac93420671b14c592d36,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,Merge_failed,060fea77f82b743a31445d3f5b0cdb8937db8507688a31a3348ba7609f5d5d8e,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,b703207acd5a2d153f3dfe89d1d9a6385c0ca151b1d322753158c08f68624a06,Merge_failed,9cb7a0f731b5d16ad13bd2bad22a48208631d06bbf1fc7312219273b373149f9,Merge_failed,3f0cf12e13fd5c8c40b4ee127fa20ec926b90b34316300d2038b770bfd23152e,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,Merge_failed,e97d8a2463fc502f51d4980b924b5a0338ffe185b3ffa520cd17efd5716cc83f,0.013509511947631836,0.01413869857788086,0.014510393142700195,0.020381450653076172,0.015007972717285156,0.015017032623291016,0.015179634094238281,0.14395380020141602,0.571819543838501,0.4676089286804199,1.5968842506408691,0.14975357055664062,0.15162873268127441,0.1745905876159668,0.21990060806274414,0.22215771675109863,0.2053685188293457,0.2135159969329834,0.20720934867858887,0.20945024490356445,0.20973491668701172,0.2091672420501709,0.20652556419372559,0.3779027462005615,0.47861433029174805,0.6803851127624512,1.724327564239502,0.20904064178466797,0.20563578605651855,0.20577478408813477,0.20459818840026855,0.20981550216674805 diff --git a/results/combined/merges_timed/docopt/docopt.java.csv b/results/combined/merges_timed/docopt/docopt.java.csv index b198d00e90..8a3a5ac019 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,True,True,Tests_passed,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,True,6,109,474,2,True,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,True,6,True,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b389e60baf2c2922876741920cf4de0cedeeb041e945266b0b9c2d9eb5f3c42f,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,Merge_failed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,05aa16e21fc40fa6b5b9b100ea84a68f3f306ffffe2aeefa8229fce09b72edbe,Tests_failed,11f4caa8ac7d4ffae9bac398664e8f46582b6472e8e0d81a0180733c866081e9,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,0.03645825386047363,0.0465090274810791,0.03952622413635254,0.015807628631591797,0.042230844497680664,0.0385591983795166,0.036847829818725586,0.16632628440856934,0.11560487747192383,0.4084336757659912,0.4676065444946289,0.04044604301452637,0.059015512466430664,0.04336690902709961,0.0579981803894043,0.05960822105407715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,True,True,Tests_passed,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,True,6,109,474,2,True,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,True,6,True,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b389e60baf2c2922876741920cf4de0cedeeb041e945266b0b9c2d9eb5f3c42f,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,Merge_failed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,05aa16e21fc40fa6b5b9b100ea84a68f3f306ffffe2aeefa8229fce09b72edbe,Tests_failed,11f4caa8ac7d4ffae9bac398664e8f46582b6472e8e0d81a0180733c866081e9,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,0.03645825386047363,0.0465090274810791,0.03952622413635254,0.015807628631591797,0.042230844497680664,0.0385591983795166,0.036847829818725586,0.16632628440856934,0.11560487747192383,0.4084336757659912,0.4676065444946289,0.04044604301452637,0.059015512466430664,0.04336690902709961,0.0579981803894043,0.05960822105407715,0.05978035926818848,0.058908700942993164,0.058173418045043945,0.059125423431396484,0.05832695960998535,0.05738329887390137,0.05950284004211426,0.09068942070007324,0.10051178932189941,0.4560563564300537,0.6027116775512695,0.059892892837524414,0.05936789512634277,0.05865144729614258,0.05916428565979004,0.0604095458984375 diff --git a/results/combined/merges_timed/doctau/garbagecat.csv b/results/combined/merges_timed/doctau/garbagecat.csv index 94e6bdda29..f595371e77 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,Tests_passed,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,True,14,91,795,3,True,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,True,14,True,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,d2bccb4adfe40fa75578f77e396fe8908393032e4a0d59ef6229df9067b1a8fd,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,ea6c149725e7327c89969c9db9391c0bc233ddf535ca5fb27a915174cc81e704,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,61adb59d2767268cd91c7181800f2821a21b26f1f577c21e829558bc4f9508d3,Tests_failed,b48953aaf8407e9c19c1d2f2fb02f0aba3e7f75a1806074e8a8b179d385ce214,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,0.03556370735168457,0.03444337844848633,0.02719402313232422,0.024359703063964844,0.04885506629943848,0.013214588165283203,0.0388035774230957,0.2362370491027832,0.12767529487609863,1.7932705879211426,2.065258741378784,0.04370546340942383,0.08397889137268066,0.05457592010498047,0.0811772346496582,0.07886624336242676 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,Tests_passed,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,True,14,91,795,3,True,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,True,14,True,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,d2bccb4adfe40fa75578f77e396fe8908393032e4a0d59ef6229df9067b1a8fd,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,ea6c149725e7327c89969c9db9391c0bc233ddf535ca5fb27a915174cc81e704,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,61adb59d2767268cd91c7181800f2821a21b26f1f577c21e829558bc4f9508d3,Tests_failed,b48953aaf8407e9c19c1d2f2fb02f0aba3e7f75a1806074e8a8b179d385ce214,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,0.03556370735168457,0.03444337844848633,0.02719402313232422,0.024359703063964844,0.04885506629943848,0.013214588165283203,0.0388035774230957,0.2362370491027832,0.12767529487609863,1.7932705879211426,2.065258741378784,0.04370546340942383,0.08397889137268066,0.05457592010498047,0.0811772346496582,0.07886624336242676,0.07723259925842285,0.07840466499328613,0.08021855354309082,0.07351565361022949,0.07718992233276367,0.08013367652893066,0.08050894737243652,0.12986230850219727,0.1435408592224121,1.7866885662078857,2.1973588466644287,0.06751704216003418,0.07521724700927734,0.07820677757263184,0.07849359512329102,0.06720352172851562 diff --git a/results/combined/merges_timed/documents4j/documents4j.csv b/results/combined/merges_timed/documents4j/documents4j.csv index 4f6c7d266b..6d30b2e903 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,36,44,655,2,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,36,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_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,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_failed,400b2c155609c93c47e2b5cf5c130b20fdd1beb504cca8c3fa4fae3a5caf99ec,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,0.08667922019958496,0.08416008949279785,0.12512469291687012,0.14719510078430176,0.12436032295227051,0.12609052658081055,0.12473607063293457,0.1905078887939453,0.14074993133544922,0.6027977466583252,0.49395084381103516,0.11181378364562988,0.10848832130432129,0.09201622009277344,0.11160135269165039,0.11056971549987793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,36,44,655,2,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,36,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_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,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_failed,400b2c155609c93c47e2b5cf5c130b20fdd1beb504cca8c3fa4fae3a5caf99ec,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,0.08667922019958496,0.08416008949279785,0.12512469291687012,0.14719510078430176,0.12436032295227051,0.12609052658081055,0.12473607063293457,0.1905078887939453,0.14074993133544922,0.6027977466583252,0.49395084381103516,0.11181378364562988,0.10848832130432129,0.09201622009277344,0.11160135269165039,0.11056971549987793,0.12621760368347168,0.10979223251342773,0.10960984230041504,0.11663389205932617,0.11010479927062988,0.11373114585876465,0.10876083374023438,0.10753941535949707,0.10051965713500977,0.7309565544128418,0.6234471797943115,0.06625103950500488,0.06676077842712402,0.06732630729675293,0.10463237762451172,0.11365509033203125 diff --git a/results/combined/merges_timed/douglasrodrigo/bfmapper.csv b/results/combined/merges_timed/douglasrodrigo/bfmapper.csv index 2ca65b5b13..033e7c5465 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,True,False,Tests_passed,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,True,62,8,244,3,True,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,True,62,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,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_failed,783ab96b4f9167b30590a821a0d21861467c2e3a68cacd3a905c67355a50b5ad,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,0.03586220741271973,0.03745388984680176,0.03504657745361328,0.018665790557861328,0.03273415565490723,0.042084455490112305,0.03528022766113281,0.15718555450439453,0.027295827865600586,0.04256582260131836,0.5383567810058594,0.03625607490539551,0.08198213577270508,0.035592079162597656,0.07943511009216309,0.07990097999572754 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,True,False,Tests_passed,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,True,62,8,244,3,True,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,True,62,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,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_failed,783ab96b4f9167b30590a821a0d21861467c2e3a68cacd3a905c67355a50b5ad,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,Tests_passed,34778236b65b5684a162a99128008e16a07b75be095791e3569932de5902ccf2,0.03586220741271973,0.03745388984680176,0.03504657745361328,0.018665790557861328,0.03273415565490723,0.042084455490112305,0.03528022766113281,0.15718555450439453,0.027295827865600586,0.04256582260131836,0.5383567810058594,0.03625607490539551,0.08198213577270508,0.035592079162597656,0.07943511009216309,0.07990097999572754,0.07702040672302246,0.07596969604492188,0.0770115852355957,0.07828474044799805,0.07845687866210938,0.07779884338378906,0.07930850982666016,0.12138175964355469,0.08532953262329102,0.08950543403625488,0.5694565773010254,0.07564616203308105,0.07738590240478516,0.07813549041748047,0.07678985595703125,0.0759725570678711 diff --git a/results/combined/merges_timed/dozedoff/similarimage.csv b/results/combined/merges_timed/dozedoff/similarimage.csv index c6b07929e6..3d14c50ba9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,True,11,59,364,3,True,11,Tests_passed,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,True,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,True,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,d0ef92d365b73e8beb51d1ab0a2d228feba105727f1917bc53b8f7a41e88efb4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Tests_failed,9d4b9d111ae563d40d7b8ceb1aa39ade0e7e4e4e92d795ca45a2b35c413edda4,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,038342a7b1f86b9c87ca106265a7fb37be38ec902fe75c316203d4fad90d83c2,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,8a6c2b3560b428fc7995fdcf50b645765f72bf1d4bd0eb04088e766e280d79ef,Tests_failed,3bc599d974087b9d11f67caa7c88952e2411fcd2ae7b88db9efd2e326c2c1695,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,0.026057004928588867,0.026169538497924805,0.029022216796875,0.027356386184692383,0.029026031494140625,0.029664993286132812,0.029549837112426758,0.07350707054138184,0.13980817794799805,1.487844705581665,0.40970325469970703,0.08826351165771484,0.08275961875915527,0.05515265464782715,0.08610844612121582,0.07912993431091309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,True,11,59,364,3,True,11,Tests_passed,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,True,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,True,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,d0ef92d365b73e8beb51d1ab0a2d228feba105727f1917bc53b8f7a41e88efb4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Tests_failed,9d4b9d111ae563d40d7b8ceb1aa39ade0e7e4e4e92d795ca45a2b35c413edda4,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,038342a7b1f86b9c87ca106265a7fb37be38ec902fe75c316203d4fad90d83c2,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,8a6c2b3560b428fc7995fdcf50b645765f72bf1d4bd0eb04088e766e280d79ef,Tests_failed,3bc599d974087b9d11f67caa7c88952e2411fcd2ae7b88db9efd2e326c2c1695,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,0.026057004928588867,0.026169538497924805,0.029022216796875,0.027356386184692383,0.029026031494140625,0.029664993286132812,0.029549837112426758,0.07350707054138184,0.13980817794799805,1.487844705581665,0.40970325469970703,0.08826351165771484,0.08275961875915527,0.05515265464782715,0.08610844612121582,0.07912993431091309,0.07598137855529785,0.057082414627075195,0.08048129081726074,0.0850532054901123,0.08020615577697754,0.06511354446411133,0.08334088325500488,0.13570833206176758,0.15024566650390625,1.6230647563934326,0.5221269130706787,0.08240008354187012,0.07782173156738281,0.05744743347167969,0.0799417495727539,0.07977175712585449 diff --git a/results/combined/merges_timed/driesschulten/dozer-model.csv b/results/combined/merges_timed/driesschulten/dozer-model.csv index 7dae1cf16e..b16f999003 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,True,True,True,12,32,104,4,True,12,Tests_passed,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,True,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,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,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Tests_failed,8cbf56ff12e76d6183bfcf18ca1b4e17b3dcd09cc95a615edb7ab0ea134e1f66,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,65f6169ce8b78faa94e83f7b5152f3a576072720f39efa509d5bbd0d2555435a,Tests_failed,4f8e26fb125a86e66c8d158282e31ab4b05d3fc9e7420b6a98424c98dd455ad9,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,0.008745431900024414,0.008878707885742188,0.008901596069335938,0.015327692031860352,0.008888959884643555,0.008908271789550781,0.008788108825683594,0.05600738525390625,0.17241263389587402,1.9921414852142334,0.49149322509765625,0.050116777420043945,0.09469437599182129,0.04214906692504883,0.09278583526611328,0.09370946884155273 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,True,True,True,12,32,104,4,True,12,Tests_passed,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,True,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,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,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Tests_failed,8cbf56ff12e76d6183bfcf18ca1b4e17b3dcd09cc95a615edb7ab0ea134e1f66,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,65f6169ce8b78faa94e83f7b5152f3a576072720f39efa509d5bbd0d2555435a,Tests_failed,4f8e26fb125a86e66c8d158282e31ab4b05d3fc9e7420b6a98424c98dd455ad9,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,0.008745431900024414,0.008878707885742188,0.008901596069335938,0.015327692031860352,0.008888959884643555,0.008908271789550781,0.008788108825683594,0.05600738525390625,0.17241263389587402,1.9921414852142334,0.49149322509765625,0.050116777420043945,0.09469437599182129,0.04214906692504883,0.09278583526611328,0.09370946884155273,0.08856034278869629,0.08870720863342285,0.08957338333129883,0.08609294891357422,0.08857059478759766,0.08962655067443848,0.08899188041687012,0.1515946388244629,0.17026376724243164,2.1239817142486572,0.6040048599243164,0.08942317962646484,0.08849215507507324,0.09015703201293945,0.08920574188232422,0.08918952941894531 diff --git a/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv b/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv index 49543bc0c7..8155e622ad 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,True,69,221,2772,2,True,69,Tests_passed,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,True,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,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,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,f225b22fa0d29b67a17471b47a6f0ef5489461e77f0a1bd4f3767afc9365858a,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,0.013883352279663086,0.013405323028564453,0.016797304153442383,0.024046659469604492,0.01618337631225586,0.01664257049560547,0.01664137840270996,0.04328656196594238,0.07869482040405273,0.7170023918151855,0.9306778907775879,0.04529571533203125,0.0722815990447998,0.043349504470825195,0.07397222518920898,0.07040691375732422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,True,69,221,2772,2,True,69,Tests_passed,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,True,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,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,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,f225b22fa0d29b67a17471b47a6f0ef5489461e77f0a1bd4f3767afc9365858a,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,Tests_passed,6cd9bc282e9d2e445719fc0d9aa699f589a8138a7c1200ad277cabb68e3ec519,0.013883352279663086,0.013405323028564453,0.016797304153442383,0.024046659469604492,0.01618337631225586,0.01664257049560547,0.01664137840270996,0.04328656196594238,0.07869482040405273,0.7170023918151855,0.9306778907775879,0.04529571533203125,0.0722815990447998,0.043349504470825195,0.07397222518920898,0.07040691375732422,0.07194042205810547,0.06679391860961914,0.07237100601196289,0.0730283260345459,0.07355451583862305,0.07337641716003418,0.07116007804870605,0.10712099075317383,0.103424072265625,0.7970857620239258,0.991105318069458,0.07086181640625,0.06924867630004883,0.06915044784545898,0.07088041305541992,0.06949400901794434 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv b/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv index 06501f32ff..aa0b4bff34 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,13,58,227,5,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,13,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,1ef5b93b6804e0adea5dbb520498ac53b1f1d2ce55b6d58d10989ecb93f5eb97,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,590b69fcb97aab33d3e0736d6c344f7104eacc5358392bed278051ff444de933,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,5aac72cc10859522a66f447850af6f4e3f58eea0a1ac52ddc44174abbb52617f,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,0.045053958892822266,0.045946359634399414,0.04284310340881348,0.015704631805419922,0.042591094970703125,0.03975868225097656,0.04336404800415039,0.36564207077026367,0.29024696350097656,1.1379117965698242,0.36657214164733887,0.08250784873962402,0.07786726951599121,0.07541346549987793,0.07792234420776367,0.07841730117797852 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,13,58,227,5,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,13,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,1ef5b93b6804e0adea5dbb520498ac53b1f1d2ce55b6d58d10989ecb93f5eb97,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,590b69fcb97aab33d3e0736d6c344f7104eacc5358392bed278051ff444de933,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,5aac72cc10859522a66f447850af6f4e3f58eea0a1ac52ddc44174abbb52617f,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,0.045053958892822266,0.045946359634399414,0.04284310340881348,0.015704631805419922,0.042591094970703125,0.03975868225097656,0.04336404800415039,0.36564207077026367,0.29024696350097656,1.1379117965698242,0.36657214164733887,0.08250784873962402,0.07786726951599121,0.07541346549987793,0.07792234420776367,0.07841730117797852,0.07817459106445312,0.07819104194641113,0.07746624946594238,0.07870841026306152,0.07837986946105957,0.0776815414428711,0.07730793952941895,0.15828990936279297,0.21968674659729004,1.307668685913086,0.4789390563964844,0.07876253128051758,0.07772326469421387,0.07998538017272949,0.07840394973754883,0.07897830009460449 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv b/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv index 82a68a117e..0491ef71e2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,8,90,644,2,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,8,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,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,adffd0aabf01bfc39c809f67c67385961584d9a6d4f04683c749d7c3be1f9e02,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,b4c576a399f7de4f4e134a07ddcc766844d5d60c2e9263838537aea20baf2d95,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,0.04240727424621582,0.0504145622253418,0.041349172592163086,0.015560626983642578,0.040465593338012695,0.0366513729095459,0.04206562042236328,0.17728829383850098,0.12490582466125488,1.0232815742492676,0.4196162223815918,0.04233288764953613,0.04270815849304199,0.04153776168823242,0.04296088218688965,0.06126856803894043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,8,90,644,2,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,8,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,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,adffd0aabf01bfc39c809f67c67385961584d9a6d4f04683c749d7c3be1f9e02,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,b4c576a399f7de4f4e134a07ddcc766844d5d60c2e9263838537aea20baf2d95,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,0.04240727424621582,0.0504145622253418,0.041349172592163086,0.015560626983642578,0.040465593338012695,0.0366513729095459,0.04206562042236328,0.17728829383850098,0.12490582466125488,1.0232815742492676,0.4196162223815918,0.04233288764953613,0.04270815849304199,0.04153776168823242,0.04296088218688965,0.06126856803894043,0.0451664924621582,0.05984210968017578,0.043657779693603516,0.0597994327545166,0.04406857490539551,0.04221057891845703,0.043699026107788086,0.0757756233215332,0.07984733581542969,1.267533779144287,0.4957845211029053,0.04370617866516113,0.04456901550292969,0.04369497299194336,0.04388761520385742,0.060918331146240234 diff --git a/results/combined/merges_timed/druid-io/druid-api.csv b/results/combined/merges_timed/druid-io/druid-api.csv index 14c0dedac6..f6c0ddf33a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,True,14,41,709,2,True,14,Tests_passed,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,True,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,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,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,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,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9b60e6439df031b70ab16b82b783f50104386db15bd231cb46b96b61e2ed904a,Tests_failed,8acc320e722ea0223cd468f7b592ab3d0e91422e5ba4ae7bee81c4ee120486e2,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,0.0344693660736084,0.04244208335876465,0.029029369354248047,0.0193026065826416,0.04823112487792969,0.041902780532836914,0.05707955360412598,0.1680145263671875,0.1023557186126709,0.8908791542053223,0.45378899574279785,0.03680157661437988,0.0609126091003418,0.03776288032531738,0.06206178665161133,0.061185359954833984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,True,14,41,709,2,True,14,Tests_passed,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,True,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,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,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,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,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9b60e6439df031b70ab16b82b783f50104386db15bd231cb46b96b61e2ed904a,Tests_failed,8acc320e722ea0223cd468f7b592ab3d0e91422e5ba4ae7bee81c4ee120486e2,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,0.0344693660736084,0.04244208335876465,0.029029369354248047,0.0193026065826416,0.04823112487792969,0.041902780532836914,0.05707955360412598,0.1680145263671875,0.1023557186126709,0.8908791542053223,0.45378899574279785,0.03680157661437988,0.0609126091003418,0.03776288032531738,0.06206178665161133,0.061185359954833984,0.057919979095458984,0.056436777114868164,0.05880093574523926,0.060573577880859375,0.06045031547546387,0.059957027435302734,0.060814857482910156,0.09440040588378906,0.09163904190063477,0.907637357711792,0.49430251121520996,0.05869936943054199,0.05879092216491699,0.05649280548095703,0.06076693534851074,0.057642459869384766 diff --git a/results/combined/merges_timed/dschulten/hydra-java.csv b/results/combined/merges_timed/dschulten/hydra-java.csv index 3c1a0a16ee..f361dc4768 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,False,True,2,2,4,5,True,5,Tests_passed,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,True,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,True,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,9f32ce54e0339718fa9b37244c9f4cdaec80c25b9a97808ddae2e0e4937e1ee1,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,79e2c0461f6f937a6dabec287b42c2f87c3377e49f21206d8bc37ed9354f8f15,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,5df6dacbbde79dd103a841de17e8481c814981c2ba48858aa8a81b459e212750,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,c9afbc05ce13569fb31ba4f923ecb0827d1f13452d99f4771e03bf1422c32267,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,0.032613515853881836,0.03868913650512695,0.05065751075744629,0.01737189292907715,0.03309512138366699,0.013527631759643555,0.03807187080383301,0.16752076148986816,0.12488985061645508,0.7807540893554688,0.3824656009674072,0.04407763481140137,0.045522212982177734,0.046392202377319336,0.04641532897949219,0.046614885330200195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,False,True,2,2,4,5,True,5,Tests_passed,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,True,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,True,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,9f32ce54e0339718fa9b37244c9f4cdaec80c25b9a97808ddae2e0e4937e1ee1,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,79e2c0461f6f937a6dabec287b42c2f87c3377e49f21206d8bc37ed9354f8f15,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,5df6dacbbde79dd103a841de17e8481c814981c2ba48858aa8a81b459e212750,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,c9afbc05ce13569fb31ba4f923ecb0827d1f13452d99f4771e03bf1422c32267,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,0.032613515853881836,0.03868913650512695,0.05065751075744629,0.01737189292907715,0.03309512138366699,0.013527631759643555,0.03807187080383301,0.16752076148986816,0.12488985061645508,0.7807540893554688,0.3824656009674072,0.04407763481140137,0.045522212982177734,0.046392202377319336,0.04641532897949219,0.046614885330200195,0.0443112850189209,0.046356201171875,0.04560494422912598,0.04600214958190918,0.047135353088378906,0.04675889015197754,0.046680450439453125,0.08095598220825195,0.08278608322143555,0.9149270057678223,0.4843871593475342,0.04708981513977051,0.04645252227783203,0.04501819610595703,0.04609870910644531,0.04516100883483887 diff --git a/results/combined/merges_timed/dspace/dspace.csv b/results/combined/merges_timed/dspace/dspace.csv index cdc1e8d297..a13ff51e06 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -525,refs/heads/main,f715667f36cae09f850977047b48d0da5e6f00a8,aa9880f0f5868fa697fa3c32a5c96e63473bebc5,1f15e032fb2ebe77557d4b3aa97fed64d8acee73,,True,False,True,3,6,14.0,2,True,3,Tests_passed,9b18c8122736fdc7135c01a80fc89c19bbded4e8742455d17526766d9cea6939,True,Tests_passed,0555121f3466b8a2a4bc1729ed27aba55be882335184e7b9838f7236b8555e92,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,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_failed,cfeef22bd9e15d5468a982e112e64ccf27db4f4279f4ed0167ad04015c788050,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,0.07073974609375,0.042960405349731445,0.05804276466369629,0.03254961967468262,0.07265281677246094,0.06050825119018555,0.036457061767578125,0.2519657611846924,0.11930203437805176,0.05240654945373535,0.37928104400634766,0.06029558181762695,0.08759474754333496,0.05833578109741211,0.0832982063293457,0.08701038360595703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +525,refs/heads/main,f715667f36cae09f850977047b48d0da5e6f00a8,aa9880f0f5868fa697fa3c32a5c96e63473bebc5,1f15e032fb2ebe77557d4b3aa97fed64d8acee73,,True,False,True,3,6,14.0,2,True,3,Tests_passed,9b18c8122736fdc7135c01a80fc89c19bbded4e8742455d17526766d9cea6939,True,Tests_passed,0555121f3466b8a2a4bc1729ed27aba55be882335184e7b9838f7236b8555e92,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,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_failed,cfeef22bd9e15d5468a982e112e64ccf27db4f4279f4ed0167ad04015c788050,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,0.07073974609375,0.042960405349731445,0.05804276466369629,0.03254961967468262,0.07265281677246094,0.06050825119018555,0.036457061767578125,0.2519657611846924,0.11930203437805176,0.05240654945373535,0.37928104400634766,0.06029558181762695,0.08759474754333496,0.05833578109741211,0.0832982063293457,0.08701038360595703,0.07903432846069336,0.07806158065795898,0.08503103256225586,0.08156037330627441,0.08410120010375977,0.08296966552734375,0.08373260498046875,0.1349637508392334,0.11361885070800781,0.09378480911254883,0.43096327781677246,0.08200216293334961,0.08168387413024902,0.08100771903991699,0.08199477195739746,0.08002853393554688 diff --git a/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv b/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv index 0b7454a7d8..f8f0cb8d4f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,True,True,Tests_passed,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,True,23,78,606,2,True,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,True,23,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,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Tests_failed,d765b3588a9593c9ace208badccad4d6885c3b3c87bd7c9bdd4890f49d8e2dc3,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,9b13ba8d8b0ec6f3b4d2894daff637481b6de06a68a831f5a8768322e028f302,Tests_failed,e01a228b93d43c16396e522559741896a164102f6c62d91e291026ff2b7ddb6b,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,0.04140782356262207,0.046434640884399414,0.04282379150390625,0.017273426055908203,0.0455317497253418,0.0439145565032959,0.04764056205749512,0.17337560653686523,0.11487030982971191,1.1155824661254883,0.35032153129577637,0.05549120903015137,0.06299066543579102,0.04633474349975586,0.06072092056274414,0.06415820121765137 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,True,True,Tests_passed,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,True,23,78,606,2,True,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,True,23,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,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Tests_failed,d765b3588a9593c9ace208badccad4d6885c3b3c87bd7c9bdd4890f49d8e2dc3,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,9b13ba8d8b0ec6f3b4d2894daff637481b6de06a68a831f5a8768322e028f302,Tests_failed,e01a228b93d43c16396e522559741896a164102f6c62d91e291026ff2b7ddb6b,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,045bc3fbeedcff491174e177268ca8a51d8c5f87047ad50c74a51420791fa85e,Tests_passed,c5378fe52792f9ea72e02bfe98d98bd472dcd9c2d2d6f438b7b56ef7c27864de,0.04140782356262207,0.046434640884399414,0.04282379150390625,0.017273426055908203,0.0455317497253418,0.0439145565032959,0.04764056205749512,0.17337560653686523,0.11487030982971191,1.1155824661254883,0.35032153129577637,0.05549120903015137,0.06299066543579102,0.04633474349975586,0.06072092056274414,0.06415820121765137,0.0592656135559082,0.061905622482299805,0.06055021286010742,0.06027555465698242,0.06054568290710449,0.05838966369628906,0.06195545196533203,0.09241223335266113,0.09832763671875,1.0988211631774902,0.41196179389953613,0.06221890449523926,0.06060075759887695,0.06106853485107422,0.058762550354003906,0.06046557426452637 diff --git a/results/combined/merges_timed/dtrules/dtrules.csv b/results/combined/merges_timed/dtrules/dtrules.csv index 8afe91f9fe..05add6a245 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,True,184,425,26318.0,4,True,184,Tests_passed,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,True,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,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,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,32147c9cf302842eb9fe5671e3e2eb09e95c414f5377cfc54f1dbf14dcf11372,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Tests_passed,78d16f19c2e58e07d114d95b79a07b221c7ed29e754cdeb1e9a64343c50c31c8,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,0.07908248901367188,0.07355642318725586,0.07282209396362305,0.07407259941101074,0.07722902297973633,0.07296228408813477,0.07873964309692383,0.3122692108154297,0.2705838680267334,653.4522542953491,-1.0,0.13279056549072266,0.16279125213623047,0.13460159301757812,0.15724849700927734,0.1629350185394287 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,True,184,425,26318.0,4,True,184,Tests_passed,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,True,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,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,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,32147c9cf302842eb9fe5671e3e2eb09e95c414f5377cfc54f1dbf14dcf11372,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Tests_passed,78d16f19c2e58e07d114d95b79a07b221c7ed29e754cdeb1e9a64343c50c31c8,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,0.07908248901367188,0.07355642318725586,0.07282209396362305,0.07407259941101074,0.07722902297973633,0.07296228408813477,0.07873964309692383,0.3122692108154297,0.2705838680267334,653.4522542953491,-1.0,0.13279056549072266,0.16279125213623047,0.13460159301757812,0.15724849700927734,0.1629350185394287,0.15745878219604492,0.15855884552001953,0.1632380485534668,0.16329216957092285,0.16027283668518066,0.16319680213928223,0.16791892051696777,0.24579715728759766,0.2658817768096924,599.9077560901642,-1.0,0.14834952354431152,0.1501767635345459,0.1548171043395996,0.15439844131469727,0.15572285652160645 diff --git a/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv b/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv index 3b4e80c119..7913fd49f9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,True,5,16,90,3,True,5,Tests_passed,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,True,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,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,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,b701338c273b72a3ebbc6807dfd2e7cf7a222c3471e097cd95ef02d6f655d8db,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,0.038802146911621094,0.03736519813537598,0.03849363327026367,0.0129547119140625,0.035156965255737305,0.03810930252075195,0.040132761001586914,0.21635937690734863,0.1702268123626709,0.9442393779754639,0.3524632453918457,0.03810286521911621,0.061242103576660156,0.04464292526245117,0.07041501998901367,0.06924843788146973 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,True,5,16,90,3,True,5,Tests_passed,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,True,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,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,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,b701338c273b72a3ebbc6807dfd2e7cf7a222c3471e097cd95ef02d6f655d8db,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,Tests_passed,6c381e62d62f2f3016e14fa2e34249a58203ebf7ab67a9a2f169f5bc2f0c3611,0.038802146911621094,0.03736519813537598,0.03849363327026367,0.0129547119140625,0.035156965255737305,0.03810930252075195,0.040132761001586914,0.21635937690734863,0.1702268123626709,0.9442393779754639,0.3524632453918457,0.03810286521911621,0.061242103576660156,0.04464292526245117,0.07041501998901367,0.06924843788146973,0.06598019599914551,0.0657200813293457,0.06556081771850586,0.06662583351135254,0.06645441055297852,0.0661160945892334,0.06588363647460938,0.1143338680267334,0.12451028823852539,0.9749939441680908,0.4215536117553711,0.06640195846557617,0.06640076637268066,0.06630921363830566,0.06684160232543945,0.06691908836364746 diff --git a/results/combined/merges_timed/dvcama/lodview.csv b/results/combined/merges_timed/dvcama/lodview.csv index e611ad465e..2467524f2a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,True,True,True,11,29,177,5,True,12,Tests_passed,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,True,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,True,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a803fdcddc819cd727fdac19418fb634e2915672bfa0e3f6e657568708b7e2e4,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,4250bae6e3ff96f7f8dd287e92d51c61840f16bf3d4be4bd44e41261fa9407c4,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d88b5be628066af74fac77fbf406c2346da15fd253a28044cf37bf2bd139097a,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,0.06262397766113281,0.0625770092010498,0.07557106018066406,0.08999896049499512,0.07616901397705078,0.07651996612548828,0.07581019401550293,0.14375758171081543,0.20682644844055176,0.06651067733764648,0.42998766899108887,0.11222076416015625,0.1712501049041748,0.0655214786529541,0.17087078094482422,0.07569503784179688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,True,True,True,11,29,177,5,True,12,Tests_passed,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,True,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,True,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a803fdcddc819cd727fdac19418fb634e2915672bfa0e3f6e657568708b7e2e4,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,4250bae6e3ff96f7f8dd287e92d51c61840f16bf3d4be4bd44e41261fa9407c4,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d88b5be628066af74fac77fbf406c2346da15fd253a28044cf37bf2bd139097a,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,d8157b5351891bfdd7aa5becc6471f6279f2f477d6a45783d571bf2618b59aef,Merge_failed,7754145f07703eddf85fd26fc203323140cea33695dafc137b0d00dc6857e0ef,0.06262397766113281,0.0625770092010498,0.07557106018066406,0.08999896049499512,0.07616901397705078,0.07651996612548828,0.07581019401550293,0.14375758171081543,0.20682644844055176,0.06651067733764648,0.42998766899108887,0.11222076416015625,0.1712501049041748,0.0655214786529541,0.17087078094482422,0.07569503784179688,0.16540217399597168,0.16813182830810547,0.07324576377868652,0.1814737319946289,0.07466721534729004,0.18423080444335938,0.07441973686218262,0.26290059089660645,0.30836939811706543,0.20869660377502441,0.49834322929382324,0.16508197784423828,0.16883230209350586,0.07503390312194824,0.17042970657348633,0.07284140586853027 diff --git a/results/combined/merges_timed/dvdme/forecastio-lib-java.csv b/results/combined/merges_timed/dvdme/forecastio-lib-java.csv index 9361c9181d..a685446008 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,False,True,5,11,70.0,2,True,5,Tests_passed,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,True,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,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,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,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,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,17d43d3fa22ea7748c4a357e79dd11eca6864c12ca9920fb006c9ff815403495,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,0.03851747512817383,0.04549908638000488,0.049376726150512695,0.02213311195373535,0.058693885803222656,0.04130721092224121,0.05769944190979004,0.17081475257873535,0.11396360397338867,1.031712293624878,0.3847825527191162,0.03991127014160156,0.06597566604614258,0.04066634178161621,0.06814837455749512,0.06720829010009766 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,False,True,5,11,70.0,2,True,5,Tests_passed,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,True,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,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,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,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,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,17d43d3fa22ea7748c4a357e79dd11eca6864c12ca9920fb006c9ff815403495,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,0.03851747512817383,0.04549908638000488,0.049376726150512695,0.02213311195373535,0.058693885803222656,0.04130721092224121,0.05769944190979004,0.17081475257873535,0.11396360397338867,1.031712293624878,0.3847825527191162,0.03991127014160156,0.06597566604614258,0.04066634178161621,0.06814837455749512,0.06720829010009766,0.061533212661743164,0.0622859001159668,0.06417465209960938,0.0637352466583252,0.0631561279296875,0.06543445587158203,0.06552791595458984,0.09873509407043457,0.09387993812561035,1.0086591243743896,0.4075436592102051,0.06431984901428223,0.06261873245239258,0.06309676170349121,0.06440186500549316,0.06283831596374512 diff --git a/results/combined/merges_timed/dwslab/dwslib.csv b/results/combined/merges_timed/dwslab/dwslib.csv index 22ad102bd2..48c2091a4f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,True,6,9,166,5,True,8,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,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,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,dfb5ba1194815d6d0edaf53f3e774bdb6de6ff25bc54261686d9d16cb55bf1cd,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,0.008374691009521484,0.008433103561401367,0.008753061294555664,0.014631271362304688,0.008295059204101562,0.008578300476074219,0.008325576782226562,0.045380353927612305,0.12120175361633301,0.6084761619567871,0.2781829833984375,0.040540218353271484,0.061804771423339844,0.04649186134338379,0.07093119621276855,0.0720205307006836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,True,6,9,166,5,True,8,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,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,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,dfb5ba1194815d6d0edaf53f3e774bdb6de6ff25bc54261686d9d16cb55bf1cd,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,Tests_passed,ec2e6bfe71edbe4e1dbf02bfa92e64476777512cfe6a647bd5c5f6b7f05b3077,0.008374691009521484,0.008433103561401367,0.008753061294555664,0.014631271362304688,0.008295059204101562,0.008578300476074219,0.008325576782226562,0.045380353927612305,0.12120175361633301,0.6084761619567871,0.2781829833984375,0.040540218353271484,0.061804771423339844,0.04649186134338379,0.07093119621276855,0.0720205307006836,0.07273435592651367,0.06879663467407227,0.07174515724182129,0.07141447067260742,0.07262396812438965,0.07267975807189941,0.06950211524963379,0.12105679512023926,0.13431382179260254,0.7943549156188965,0.37712931632995605,0.07144379615783691,0.07127714157104492,0.07146883010864258,0.07190155982971191,0.07277202606201172 diff --git a/results/combined/merges_timed/dynjs/dynjs.csv b/results/combined/merges_timed/dynjs/dynjs.csv index f8e5a9be6d..25acbdc556 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,True,227,923,9393,4,True,227,Tests_passed,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,True,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,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,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,6efda24ee9206b040696c581cbfebff2638e2451cc438d9123ffc09172d74f03,Tests_failed,29e0f67f60ff12d6b34429ca2457ac7ea99ac07eae98931cd9106e604f56bdb4,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,0.022417783737182617,0.0228421688079834,0.026670217514038086,0.035765886306762695,0.027187824249267578,0.027356386184692383,0.027282238006591797,0.0830237865447998,0.1852128505706787,3.2998459339141846,64.67376232147217,0.060689449310302734,0.1481020450592041,0.061890602111816406,0.14788317680358887,0.15199780464172363 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,True,227,923,9393,4,True,227,Tests_passed,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,True,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,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,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,6efda24ee9206b040696c581cbfebff2638e2451cc438d9123ffc09172d74f03,Tests_failed,29e0f67f60ff12d6b34429ca2457ac7ea99ac07eae98931cd9106e604f56bdb4,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,Tests_passed,3060a737e0e823cdb7599e4a272036b96c03cd11bee22a2291262d5eba6fd079,0.022417783737182617,0.0228421688079834,0.026670217514038086,0.035765886306762695,0.027187824249267578,0.027356386184692383,0.027282238006591797,0.0830237865447998,0.1852128505706787,3.2998459339141846,64.67376232147217,0.060689449310302734,0.1481020450592041,0.061890602111816406,0.14788317680358887,0.15199780464172363,0.13968586921691895,0.14554476737976074,0.14190959930419922,0.1431748867034912,0.14242172241210938,0.14630675315856934,0.14566326141357422,0.22301316261291504,0.21945500373840332,3.5346763134002686,64.80515766143799,0.14209794998168945,0.1418752670288086,0.1397242546081543,0.1464557647705078,0.1359262466430664 diff --git a/results/combined/merges_timed/e-mzungu/rjc.csv b/results/combined/merges_timed/e-mzungu/rjc.csv index 5f872cabd2..40de598cd4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,True,10,68,339,2,True,10,Tests_passed,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,True,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,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,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,e8cf609e254a05e30718c08ea7d0027f7e24833686a7e71f192631acc8e75d1e,Tests_passed,e1355d8f2bb648f149aa8cff30687ae77c683218cfcd1f7f3ffd4e9d6f8fe11f,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,0.011702775955200195,0.011842727661132812,0.012294530868530273,0.017941951751708984,0.011888265609741211,0.01207876205444336,0.01198887825012207,0.03963947296142578,0.07949328422546387,0.8306918144226074,1.0175237655639648,0.05270504951477051,0.04420781135559082,0.04550457000732422,0.04600358009338379,0.046700477600097656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,True,10,68,339,2,True,10,Tests_passed,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,True,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,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,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,e8cf609e254a05e30718c08ea7d0027f7e24833686a7e71f192631acc8e75d1e,Tests_passed,e1355d8f2bb648f149aa8cff30687ae77c683218cfcd1f7f3ffd4e9d6f8fe11f,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,0.011702775955200195,0.011842727661132812,0.012294530868530273,0.017941951751708984,0.011888265609741211,0.01207876205444336,0.01198887825012207,0.03963947296142578,0.07949328422546387,0.8306918144226074,1.0175237655639648,0.05270504951477051,0.04420781135559082,0.04550457000732422,0.04600358009338379,0.046700477600097656,0.04451632499694824,0.04354691505432129,0.046694040298461914,0.04498696327209473,0.04507851600646973,0.045107126235961914,0.04439091682434082,0.0781552791595459,0.10563945770263672,0.7907485961914062,1.1062309741973877,0.04474020004272461,0.04571247100830078,0.04486393928527832,0.0451807975769043,0.04296541213989258 diff --git a/results/combined/merges_timed/eaftan/hprof-parser.csv b/results/combined/merges_timed/eaftan/hprof-parser.csv index c36b5a2d22..7dbcad4ef2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,True,True,Tests_passed,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,True,5,55,301,2,True,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,True,5,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,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,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,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,ca1267c044f9d73a8456ea59cb4fbb2448e258c627c4d7fa516f77b13e07e917,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,0.054485321044921875,0.0552520751953125,0.0825040340423584,0.09371829032897949,0.08211636543273926,0.07959127426147461,0.07789087295532227,0.09234809875488281,0.11263108253479004,1.3085620403289795,0.5057661533355713,0.14288067817687988,0.16573548316955566,0.13547968864440918,0.15864348411560059,0.16900229454040527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,True,True,Tests_passed,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,True,5,55,301,2,True,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,True,5,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,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,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,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,ca1267c044f9d73a8456ea59cb4fbb2448e258c627c4d7fa516f77b13e07e917,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,0.054485321044921875,0.0552520751953125,0.0825040340423584,0.09371829032897949,0.08211636543273926,0.07959127426147461,0.07789087295532227,0.09234809875488281,0.11263108253479004,1.3085620403289795,0.5057661533355713,0.14288067817687988,0.16573548316955566,0.13547968864440918,0.15864348411560059,0.16900229454040527,0.1639392375946045,0.15499401092529297,0.1814441680908203,0.19194936752319336,0.19154787063598633,0.19086599349975586,0.1846606731414795,0.20858979225158691,0.22546768188476562,1.496042251586914,0.7198867797851562,0.1594846248626709,0.1617882251739502,0.16036272048950195,0.1577165126800537,0.16965627670288086 diff --git a/results/combined/merges_timed/easetech/easytest-core.csv b/results/combined/merges_timed/easetech/easytest-core.csv index b772934c92..0ef0c0fa64 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,True,20.0,79,265.0,4,True,20,Tests_passed,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,True,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,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,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,ad1016111bd746dc908b7697d49c8782c01e51578306ce6b6cdb27667b694274,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,0.04332685470581055,0.05734992027282715,0.04378318786621094,0.02864384651184082,0.04619288444519043,0.05008435249328613,0.05159306526184082,0.3076152801513672,0.23147320747375488,3.70242977142334,0.5736935138702393,0.04940390586853027,0.12822365760803223,0.036544084548950195,0.1191716194152832,0.1278064250946045 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,True,20.0,79,265.0,4,True,20,Tests_passed,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,True,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,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,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,ad1016111bd746dc908b7697d49c8782c01e51578306ce6b6cdb27667b694274,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,a2bdad9ffa377bddaca233f9f307bf8a653f378770ee0ec9b07d1ef1f59778d9,Tests_passed,5ba66e60bc1254f33bad5ce40514db6d2a1bb7f5c72c90a8f4a321240185494b,0.04332685470581055,0.05734992027282715,0.04378318786621094,0.02864384651184082,0.04619288444519043,0.05008435249328613,0.05159306526184082,0.3076152801513672,0.23147320747375488,3.70242977142334,0.5736935138702393,0.04940390586853027,0.12822365760803223,0.036544084548950195,0.1191716194152832,0.1278064250946045,0.11920523643493652,0.11742568016052246,0.12396860122680664,0.12236428260803223,0.1043088436126709,0.12070488929748535,0.11453723907470703,0.18762683868408203,0.18828415870666504,3.6899285316467285,0.6387763023376465,0.1185450553894043,0.11995697021484375,0.11752104759216309,0.10334086418151855,0.11937618255615234 diff --git a/results/combined/merges_timed/ebay/xcelite.csv b/results/combined/merges_timed/ebay/xcelite.csv index b89507c546..cece479f01 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,True,True,Tests_passed,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,True,71,101,1423,5,True,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,True,71,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,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Tests_failed,d92e8b39ddf4d6f5b3f7434fe047302d802f3e15dcba136c12435c7981f2e5e4,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,0000f14f384f869a0d3c400a98a48b8ac9958236fcb6eaf408cb5383601ae3fd,Merge_failed,ce429794ca54e1241632ac3dde9525bd3b9666f5317139a62101f718d10f12a7,Merge_failed,81c6ec3017aeb9eda0dad11cf93b98d4b37d18e213c608492aa9041a024855b0,Tests_failed,023e26893f8dd93d12015c9f71fcec87d56051639bed90adb54f8284d4750924,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,0.014155387878417969,0.014150381088256836,0.01495051383972168,0.021783113479614258,0.015190839767456055,0.015030860900878906,0.015348196029663086,0.07494711875915527,0.12360000610351562,1.2328314781188965,0.727287769317627,0.05881500244140625,0.11280584335327148,0.05332374572753906,0.12083029747009277,0.1109929084777832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,True,True,Tests_passed,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,True,71,101,1423,5,True,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,True,71,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,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Tests_failed,d92e8b39ddf4d6f5b3f7434fe047302d802f3e15dcba136c12435c7981f2e5e4,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,0000f14f384f869a0d3c400a98a48b8ac9958236fcb6eaf408cb5383601ae3fd,Merge_failed,ce429794ca54e1241632ac3dde9525bd3b9666f5317139a62101f718d10f12a7,Merge_failed,81c6ec3017aeb9eda0dad11cf93b98d4b37d18e213c608492aa9041a024855b0,Tests_failed,023e26893f8dd93d12015c9f71fcec87d56051639bed90adb54f8284d4750924,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,23ca488bcd61490c12eb12f5519837f57de1efabd26d4854bdfd2cfb333ba5d9,Merge_failed,aa265fa7a21a6b207edba40ff5af385f69ab9f20ba9c167a63df81d437bb5f02,0.014155387878417969,0.014150381088256836,0.01495051383972168,0.021783113479614258,0.015190839767456055,0.015030860900878906,0.015348196029663086,0.07494711875915527,0.12360000610351562,1.2328314781188965,0.727287769317627,0.05881500244140625,0.11280584335327148,0.05332374572753906,0.12083029747009277,0.1109929084777832,0.11953043937683105,0.11534929275512695,0.12113571166992188,0.11374831199645996,0.12225604057312012,0.12361431121826172,0.1211698055267334,0.20519328117370605,0.17947793006896973,1.4991374015808105,0.9106466770172119,0.12427186965942383,0.12256169319152832,0.12157797813415527,0.12078046798706055,0.11533951759338379 diff --git a/results/combined/merges_timed/edwardcapriolo/nibiru.csv b/results/combined/merges_timed/edwardcapriolo/nibiru.csv index ad6f245aff..9ee9ce84ea 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,True,14,46,224,2,True,14,Tests_passed,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,True,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,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,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,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,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,ffa03caf498fe054ef0b1dd65ed4108d26d79b90e6537f1202bc330ba53d07b0,Tests_failed,f4f68b812047dc702b015c143eb4705aa0c3368d9fa8179f69d9f125dfa5da53,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,0.030964374542236328,0.05541348457336426,0.04754233360290527,0.0177609920501709,0.05126166343688965,0.04294419288635254,0.051326751708984375,0.16785430908203125,0.11601042747497559,0.9091708660125732,0.5511682033538818,0.037653446197509766,0.061716318130493164,0.03883075714111328,0.06212043762207031,0.05925178527832031 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,True,14,46,224,2,True,14,Tests_passed,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,True,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,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,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,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,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,ffa03caf498fe054ef0b1dd65ed4108d26d79b90e6537f1202bc330ba53d07b0,Tests_failed,f4f68b812047dc702b015c143eb4705aa0c3368d9fa8179f69d9f125dfa5da53,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,0.030964374542236328,0.05541348457336426,0.04754233360290527,0.0177609920501709,0.05126166343688965,0.04294419288635254,0.051326751708984375,0.16785430908203125,0.11601042747497559,0.9091708660125732,0.5511682033538818,0.037653446197509766,0.061716318130493164,0.03883075714111328,0.06212043762207031,0.05925178527832031,0.06313633918762207,0.06284737586975098,0.06553888320922852,0.06391477584838867,0.06406140327453613,0.0657510757446289,0.06542730331420898,0.09967207908630371,0.09291577339172363,0.9427952766418457,0.6460778713226318,0.06096148490905762,0.06269645690917969,0.06318163871765137,0.06137228012084961,0.062097787857055664 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 b231e1df10..b097cf20cd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,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,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,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,0873103770310e66b215c3493c7b0d7867edac12312539637d0e74a15e4261e3,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,0.036690473556518555,0.046187639236450195,0.044205427169799805,0.014759302139282227,0.046073198318481445,0.04022049903869629,0.046515464782714844,0.11889767646789551,0.11903548240661621,1.0518982410430908,0.30756545066833496,0.030306100845336914,0.05496573448181152,0.03023815155029297,0.05507540702819824,0.05487489700317383 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,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,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,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,0873103770310e66b215c3493c7b0d7867edac12312539637d0e74a15e4261e3,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,0.036690473556518555,0.046187639236450195,0.044205427169799805,0.014759302139282227,0.046073198318481445,0.04022049903869629,0.046515464782714844,0.11889767646789551,0.11903548240661621,1.0518982410430908,0.30756545066833496,0.030306100845336914,0.05496573448181152,0.03023815155029297,0.05507540702819824,0.05487489700317383,0.05588221549987793,0.05544734001159668,0.05485987663269043,0.056731224060058594,0.05540347099304199,0.05490374565124512,0.05568504333496094,0.08969330787658691,0.08775782585144043,1.1410560607910156,0.36124730110168457,0.05532956123352051,0.056497812271118164,0.05389833450317383,0.05528903007507324,0.05662059783935547 diff --git a/results/combined/merges_timed/ehcache/sizeof.csv b/results/combined/merges_timed/ehcache/sizeof.csv index 80d5b91f2f..de4c640d86 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,True,11,43,491,2,True,11,Tests_passed,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,True,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,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,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,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,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,c1e95b82a41a92c408d30e09802974a8216d94b1419cb1a9923ddc40edd1eda9,Tests_failed,9c46e98d9e9c78a882801a488aea049d43f54b053cacec0513ac84fff620ffe9,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,0.047981977462768555,0.04913783073425293,0.039585113525390625,0.017756223678588867,0.043399810791015625,0.047023773193359375,0.03549003601074219,0.17633891105651855,0.11764001846313477,0.8777697086334229,0.402332067489624,0.0350184440612793,0.060478925704956055,0.0343172550201416,0.059388160705566406,0.06091189384460449 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,True,11,43,491,2,True,11,Tests_passed,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,True,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,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,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,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,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,c1e95b82a41a92c408d30e09802974a8216d94b1419cb1a9923ddc40edd1eda9,Tests_failed,9c46e98d9e9c78a882801a488aea049d43f54b053cacec0513ac84fff620ffe9,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,0.047981977462768555,0.04913783073425293,0.039585113525390625,0.017756223678588867,0.043399810791015625,0.047023773193359375,0.03549003601074219,0.17633891105651855,0.11764001846313477,0.8777697086334229,0.402332067489624,0.0350184440612793,0.060478925704956055,0.0343172550201416,0.059388160705566406,0.06091189384460449,0.061037540435791016,0.05967259407043457,0.0616755485534668,0.06018710136413574,0.06024503707885742,0.060029029846191406,0.06078195571899414,0.09536099433898926,0.09154248237609863,1.0185563564300537,0.4584634304046631,0.05991029739379883,0.05986356735229492,0.05913949012756348,0.059392690658569336,0.06023359298706055 diff --git a/results/combined/merges_timed/einsamhauer/disthene-reader.csv b/results/combined/merges_timed/einsamhauer/disthene-reader.csv index 9a8408bd9a..56e6f2c710 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,Tests_passed,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,True,159,641,3085,12,True,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,True,160,True,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ddae62cea325581966160f952c45b1734cfc22c6932fcd21362446ca9996060d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,Merge_failed,4d529c6fe9242a034c9f7d83ea113949b63293e8395991b436e65f65807d895b,Merge_failed,c892a7ef031903f9f22d0197549a3e5e489a3619f4944d5c8496240c71e1b4ae,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,c82cf169247713333e6b4fc10b9449848115bcb16dea9f36bdf6ab8f214cc980,Merge_failed,ce77da758f454ee2d67e9ec04761b819799e3e0849fd2aae58dbb9ede865df83,Merge_failed,63513d235158582d668fc0b37bc11030e2ca6c7fd5cc10827bb7d534c7953293,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,0.027855873107910156,0.028504371643066406,0.030364990234375,0.04084157943725586,0.030994176864624023,0.031163692474365234,0.031351566314697266,0.18462419509887695,0.5813229084014893,6.812468528747559,1.3445711135864258,0.13277411460876465,0.21076703071594238,0.12045931816101074,0.21501851081848145,0.24486899375915527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,Tests_passed,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,True,159,641,3085,12,True,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,True,160,True,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ddae62cea325581966160f952c45b1734cfc22c6932fcd21362446ca9996060d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,Merge_failed,4d529c6fe9242a034c9f7d83ea113949b63293e8395991b436e65f65807d895b,Merge_failed,c892a7ef031903f9f22d0197549a3e5e489a3619f4944d5c8496240c71e1b4ae,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,c82cf169247713333e6b4fc10b9449848115bcb16dea9f36bdf6ab8f214cc980,Merge_failed,ce77da758f454ee2d67e9ec04761b819799e3e0849fd2aae58dbb9ede865df83,Merge_failed,63513d235158582d668fc0b37bc11030e2ca6c7fd5cc10827bb7d534c7953293,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,9f20e312e992a11376534fc929a7f679379a4603dcd2a2d1523c228bb0275106,Merge_failed,26521d60c21e923a1d6aebc95539290035c6377e5927ffbc452b05a7ead4bc1c,0.027855873107910156,0.028504371643066406,0.030364990234375,0.04084157943725586,0.030994176864624023,0.031163692474365234,0.031351566314697266,0.18462419509887695,0.5813229084014893,6.812468528747559,1.3445711135864258,0.13277411460876465,0.21076703071594238,0.12045931816101074,0.21501851081848145,0.24486899375915527,0.21642446517944336,0.24231338500976562,0.2473585605621338,0.21586060523986816,0.24553942680358887,0.24500274658203125,0.2180008888244629,0.44811201095581055,0.5408551692962646,8.062273740768433,1.6503956317901611,0.21918082237243652,0.2405872344970703,0.22673535346984863,0.2140195369720459,0.24829459190368652 diff --git a/results/combined/merges_timed/einsamhauer/disthene.csv b/results/combined/merges_timed/einsamhauer/disthene.csv index 5fc30d0bd0..ed5ccadb08 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,True,False,Tests_passed,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,True,2,1,2,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,True,3,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,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,05cf6a821424bc35092e770a79983962d212e9f7db3e47f0b0b2d493880b6a08,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,0.009107589721679688,0.00919651985168457,0.009766101837158203,0.015251874923706055,0.009645700454711914,0.00965118408203125,0.009425878524780273,0.03374361991882324,0.06480002403259277,0.7571911811828613,0.30777668952941895,0.03141307830810547,0.05732870101928711,0.030988216400146484,0.05750322341918945,0.05881166458129883 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,True,False,Tests_passed,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,True,2,1,2,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,True,3,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,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,05cf6a821424bc35092e770a79983962d212e9f7db3e47f0b0b2d493880b6a08,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,Tests_passed,2803578c25c4be57a2094c8dd4059d8b54d9fb79454fa23fd114075adf25e58c,0.009107589721679688,0.00919651985168457,0.009766101837158203,0.015251874923706055,0.009645700454711914,0.00965118408203125,0.009425878524780273,0.03374361991882324,0.06480002403259277,0.7571911811828613,0.30777668952941895,0.03141307830810547,0.05732870101928711,0.030988216400146484,0.05750322341918945,0.05881166458129883,0.054856061935424805,0.055979013442993164,0.0565028190612793,0.05647706985473633,0.055327653884887695,0.056528329849243164,0.054421424865722656,0.08897280693054199,0.0865776538848877,0.8694994449615479,0.33901429176330566,0.05641627311706543,0.05702042579650879,0.05548739433288574,0.05450177192687988,0.056719064712524414 diff --git a/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv b/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv index 51b6fed768..de88545130 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,True,True,True,17,46,835,10,True,19,Tests_passed,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,True,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,True,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,9e5516f24d5c23a693382ff4965cfcec5b150608ecd5c665f10438d496cb5495,Merge_failed,c22fc698444788a8804282f2d3c495bc02196c1329b713af1671e9f2fa336b60,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,Merge_failed,9f2111fc8a296292325f35d02de8b080317d9fe95660f27c5589d1740e230ee5,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,2d3506e9ece01406c9684d3e8b14e1c1665dc2d53c1a4af34c67ac76203e7d73,Merge_failed,2d3506e9ece01406c9684d3e8b14e1c1665dc2d53c1a4af34c67ac76203e7d73,Merge_failed,13b8f6ee33989693c68a3f9d1bdc534ae8b0995082a7a8129276cf5feea283f2,Merge_failed,6560fd26fe58e7aeadcb32dbb1179e1784ff7344984e9b3f44352b7cf4bb61e4,Merge_failed,9b8652679308ea3f43961a07d1c83dd7d6296f9d08fbc64429c830b3988d4167,Merge_failed,ac1e27525ca7fb586204bedefe40f85c7a9b1502850dea97528ce3f4844e1651,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.017856836318969727,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.4687974452972412,1.1047439575195312,0.32912755012512207,0.11836624145507812,0.11676263809204102,0.1163778305053711,0.15877842903137207,0.15101313591003418 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,True,True,True,17,46,835,10,True,19,Tests_passed,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,True,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,True,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,9e5516f24d5c23a693382ff4965cfcec5b150608ecd5c665f10438d496cb5495,Merge_failed,c22fc698444788a8804282f2d3c495bc02196c1329b713af1671e9f2fa336b60,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,Merge_failed,9f2111fc8a296292325f35d02de8b080317d9fe95660f27c5589d1740e230ee5,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,2d3506e9ece01406c9684d3e8b14e1c1665dc2d53c1a4af34c67ac76203e7d73,Merge_failed,2d3506e9ece01406c9684d3e8b14e1c1665dc2d53c1a4af34c67ac76203e7d73,Merge_failed,13b8f6ee33989693c68a3f9d1bdc534ae8b0995082a7a8129276cf5feea283f2,Merge_failed,6560fd26fe58e7aeadcb32dbb1179e1784ff7344984e9b3f44352b7cf4bb61e4,Merge_failed,9b8652679308ea3f43961a07d1c83dd7d6296f9d08fbc64429c830b3988d4167,Merge_failed,ac1e27525ca7fb586204bedefe40f85c7a9b1502850dea97528ce3f4844e1651,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,ef5d5da96da1500f558f70f6efe94d5364d6df1ff07c69e618951408c86e6382,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.017856836318969727,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.4687974452972412,1.1047439575195312,0.32912755012512207,0.11836624145507812,0.11676263809204102,0.1163778305053711,0.15877842903137207,0.15101313591003418,0.15594267845153809,0.14922595024108887,0.16182613372802734,0.1460709571838379,0.16438961029052734,0.16481566429138184,0.14806866645812988,0.28656983375549316,0.36510133743286133,1.2898669242858887,0.5227527618408203,0.16205811500549316,0.15693163871765137,0.15208077430725098,0.15827488899230957,0.15070724487304688 diff --git a/results/combined/merges_timed/ekryd/sortpom.csv b/results/combined/merges_timed/ekryd/sortpom.csv index fbb79eb232..3cb90bbb39 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,True,11,16,102,2,True,11,Tests_passed,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,True,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,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_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,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,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,0.046096086502075195,0.03253674507141113,0.03606820106506348,0.047815799713134766,0.03765535354614258,0.05329108238220215,0.050581932067871094,0.1691133975982666,0.12361860275268555,0.04256916046142578,0.2872440814971924,0.08383989334106445,0.1020042896270752,0.08371329307556152,0.10439658164978027,0.10354399681091309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,True,11,16,102,2,True,11,Tests_passed,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,True,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,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_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,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,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,0.046096086502075195,0.03253674507141113,0.03606820106506348,0.047815799713134766,0.03765535354614258,0.05329108238220215,0.050581932067871094,0.1691133975982666,0.12361860275268555,0.04256916046142578,0.2872440814971924,0.08383989334106445,0.1020042896270752,0.08371329307556152,0.10439658164978027,0.10354399681091309,0.10680651664733887,0.08670544624328613,0.09046053886413574,0.08503937721252441,0.08471083641052246,0.08458948135375977,0.08205747604370117,0.10045242309570312,0.08606243133544922,0.07919740676879883,0.31336021423339844,0.10620403289794922,0.1027824878692627,0.1047053337097168,0.09559297561645508,0.08522343635559082 diff --git a/results/combined/merges_timed/ekt/biblio-transformation-engine.csv b/results/combined/merges_timed/ekt/biblio-transformation-engine.csv index 6ece9c0651..babb60b232 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,True,24,82,858,5,True,24,Tests_passed,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,True,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,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,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,6f35e2907fe2e7132b87c54723afa2849cd30d556cdf48864b30bb67db2aeeb7,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,0.011239767074584961,0.011061429977416992,0.012454509735107422,0.019849538803100586,0.01262974739074707,0.012313604354858398,0.012330293655395508,0.07276320457458496,0.23381328582763672,0.6087615489959717,0.5574827194213867,0.06650686264038086,0.09170317649841309,0.08379960060119629,0.11664986610412598,0.11684250831604004 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,True,24,82,858,5,True,24,Tests_passed,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,True,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,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,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,6f35e2907fe2e7132b87c54723afa2849cd30d556cdf48864b30bb67db2aeeb7,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,Tests_passed,9d34e30f9b234598adf93f7ae921a0549cb0435a3600c1292323362f0d714762,0.011239767074584961,0.011061429977416992,0.012454509735107422,0.019849538803100586,0.01262974739074707,0.012313604354858398,0.012330293655395508,0.07276320457458496,0.23381328582763672,0.6087615489959717,0.5574827194213867,0.06650686264038086,0.09170317649841309,0.08379960060119629,0.11664986610412598,0.11684250831604004,0.12001776695251465,0.1192939281463623,0.11871099472045898,0.11961126327514648,0.1210944652557373,0.11991405487060547,0.11701369285583496,0.19881343841552734,0.23709726333618164,0.7693309783935547,0.7419712543487549,0.11795592308044434,0.11776137351989746,0.11806821823120117,0.11912178993225098,0.11760139465332031 diff --git a/results/combined/merges_timed/elasticjob/elastic-job-lite.csv b/results/combined/merges_timed/elasticjob/elastic-job-lite.csv index 1f55b2ada8..5c8a893c87 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,True,27,93,380,2,True,27,Tests_passed,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,True,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,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,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,467171311816f1cf4e3dd571793d36b673b9609b433c66695fef0df8bf384f8b,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.02355170249938965,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.1069793701171875,1.0078010559082031,0.7306873798370361,0.0452115535736084,0.07080078125,0.0451352596282959,0.07303476333618164,0.07215714454650879 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,True,27,93,380,2,True,27,Tests_passed,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,True,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,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,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,467171311816f1cf4e3dd571793d36b673b9609b433c66695fef0df8bf384f8b,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,Tests_passed,bb7b98c5ad4a543167c74b67807dbf92a3daa5b2e8e0f7a0bdf1a10b2642d6fb,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.02355170249938965,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.1069793701171875,1.0078010559082031,0.7306873798370361,0.0452115535736084,0.07080078125,0.0451352596282959,0.07303476333618164,0.07215714454650879,0.06649971008300781,0.06838536262512207,0.07074189186096191,0.0697622299194336,0.06945610046386719,0.0713808536529541,0.07012820243835449,0.10886573791503906,0.10328102111816406,1.0551893711090088,0.7651376724243164,0.06989812850952148,0.06823563575744629,0.06918764114379883,0.06857013702392578,0.06997132301330566 diff --git a/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv b/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv index 4424e45670..dd590ba3fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,True,6,26,154,2,True,6,Tests_passed,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,True,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,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,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,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,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,417d613e0d02e7e8156051085cab7b069403512b9a90aefdaef115b84ed48de3,Tests_failed,c0956b00719a3fadb20662c236dce495058676b64f03317f6c17941a9e1d9448,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,0.03738808631896973,0.045957326889038086,0.07046294212341309,0.05351376533508301,0.047400712966918945,0.05252528190612793,0.051419734954833984,0.14908790588378906,0.09929585456848145,1.0610864162445068,0.5624740123748779,0.08614301681518555,0.10930967330932617,0.08410954475402832,0.11257457733154297,0.10403275489807129 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,True,6,26,154,2,True,6,Tests_passed,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,True,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,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,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,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,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,417d613e0d02e7e8156051085cab7b069403512b9a90aefdaef115b84ed48de3,Tests_failed,c0956b00719a3fadb20662c236dce495058676b64f03317f6c17941a9e1d9448,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,0.03738808631896973,0.045957326889038086,0.07046294212341309,0.05351376533508301,0.047400712966918945,0.05252528190612793,0.051419734954833984,0.14908790588378906,0.09929585456848145,1.0610864162445068,0.5624740123748779,0.08614301681518555,0.10930967330932617,0.08410954475402832,0.11257457733154297,0.10403275489807129,0.10443973541259766,0.10904312133789062,0.12219047546386719,0.11863946914672852,0.12613248825073242,0.1238248348236084,0.1151590347290039,0.1703174114227295,0.15233659744262695,1.2379233837127686,0.6286475658416748,0.11176228523254395,0.11143255233764648,0.10407686233520508,0.10875988006591797,0.10537052154541016 diff --git a/results/combined/merges_timed/elisarver/selophane.csv b/results/combined/merges_timed/elisarver/selophane.csv index 10d4a1009f..e8195bdff3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,True,True,Tests_passed,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,True,4,6,19,2,True,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,True,4,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,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,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,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,601e4d60b079dd202b333afe183d08b200279bc0e49bef4f4785722f5b9dca34,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,0.04115462303161621,0.03626418113708496,0.04663372039794922,0.015427827835083008,0.04269838333129883,0.04170703887939453,0.04449176788330078,0.16195106506347656,0.10846519470214844,0.6390337944030762,0.2675480842590332,0.030577898025512695,0.05495715141296387,0.031580448150634766,0.055353641510009766,0.05519986152648926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,True,True,Tests_passed,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,True,4,6,19,2,True,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,True,4,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,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,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,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,601e4d60b079dd202b333afe183d08b200279bc0e49bef4f4785722f5b9dca34,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,0.04115462303161621,0.03626418113708496,0.04663372039794922,0.015427827835083008,0.04269838333129883,0.04170703887939453,0.04449176788330078,0.16195106506347656,0.10846519470214844,0.6390337944030762,0.2675480842590332,0.030577898025512695,0.05495715141296387,0.031580448150634766,0.055353641510009766,0.05519986152648926,0.05314016342163086,0.05342292785644531,0.05355548858642578,0.05290651321411133,0.05185270309448242,0.053086042404174805,0.0536656379699707,0.08446383476257324,0.08330321311950684,0.6562368869781494,0.3006882667541504,0.05334973335266113,0.053128719329833984,0.052834272384643555,0.0525205135345459,0.054117679595947266 diff --git a/results/combined/merges_timed/elunez/eladmin.csv b/results/combined/merges_timed/elunez/eladmin.csv index 45b474d23c..87872d9a39 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,True,45,139,771.0,4,True,45,Tests_passed,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,True,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,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,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,605eea0cdf8df417b56cbb847041f88032e6b9bb2b0e789caef71837a273839d,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.029398679733276367,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.17467880249023438,0.04268646240234375,0.7208957672119141,0.061243534088134766,0.06138014793395996,0.0729379653930664,0.07125353813171387,0.06022500991821289 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,True,45,139,771.0,4,True,45,Tests_passed,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,True,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,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,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,605eea0cdf8df417b56cbb847041f88032e6b9bb2b0e789caef71837a273839d,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.029398679733276367,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.17467880249023438,0.04268646240234375,0.7208957672119141,0.061243534088134766,0.06138014793395996,0.0729379653930664,0.07125353813171387,0.06022500991821289,0.06816792488098145,0.05935239791870117,0.070709228515625,0.07129907608032227,0.05971527099609375,0.07080364227294922,0.06835699081420898,0.11693692207336426,0.12135934829711914,0.08345222473144531,0.7938337326049805,0.06144094467163086,0.059845685958862305,0.06799769401550293,0.058931827545166016,0.05877566337585449 diff --git a/results/combined/merges_timed/emicklei/rendersnake.csv b/results/combined/merges_timed/emicklei/rendersnake.csv index 7cc4522d4f..f871ddc224 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,True,311,656,49552,2,True,311,Tests_passed,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,True,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,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,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,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,beb9eaed02c76b9a1813e9738d47cd506acf5ade1c9e9d8f3bd818f926afe1e0,Tests_passed,6dbc5ebbb7a35e96dc8c64126c556bb3812a5279faea8d4505b7741c1c4cf897,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,0.0669562816619873,0.0765678882598877,0.08143997192382812,0.06646156311035156,0.07523989677429199,0.08072328567504883,0.07880496978759766,0.22412633895874023,0.11698412895202637,2.9076600074768066,1.3821003437042236,0.11272478103637695,0.15839886665344238,0.10957646369934082,0.16179656982421875,0.15779995918273926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,True,311,656,49552,2,True,311,Tests_passed,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,True,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,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,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,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,beb9eaed02c76b9a1813e9738d47cd506acf5ade1c9e9d8f3bd818f926afe1e0,Tests_passed,6dbc5ebbb7a35e96dc8c64126c556bb3812a5279faea8d4505b7741c1c4cf897,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,0.0669562816619873,0.0765678882598877,0.08143997192382812,0.06646156311035156,0.07523989677429199,0.08072328567504883,0.07880496978759766,0.22412633895874023,0.11698412895202637,2.9076600074768066,1.3821003437042236,0.11272478103637695,0.15839886665344238,0.10957646369934082,0.16179656982421875,0.15779995918273926,0.17041325569152832,0.16024255752563477,0.17447662353515625,0.18134236335754395,0.17389345169067383,0.1846921443939209,0.17115068435668945,0.224015474319458,0.2099895477294922,3.101055383682251,1.6465332508087158,0.16238927841186523,0.15561938285827637,0.16147875785827637,0.16069865226745605,0.15918803215026855 diff --git a/results/combined/merges_timed/engine-alpha/engine-alpha.csv b/results/combined/merges_timed/engine-alpha/engine-alpha.csv index 2a04e15f01..f76603f108 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,True,8,28,106.0,2,True,8,Tests_passed,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,True,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,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,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,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,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,500a73786885a24cfc7cc13dbe76bcc724b585e0a32c72d92d0ca73e1b253e9d,Tests_passed,cc8601b412006067ba7ef2ee41af02833d85d2fa1b26fe1cb2b888c6f8a31c26,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,0.05210590362548828,0.010829687118530273,0.0750577449798584,0.01726078987121582,0.07459902763366699,0.07420802116394043,0.07422351837158203,0.12136220932006836,0.10771298408508301,0.6795861721038818,0.3673839569091797,0.03417229652404785,0.060286760330200195,0.034705400466918945,0.05952715873718262,0.0596921443939209 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,True,8,28,106.0,2,True,8,Tests_passed,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,True,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,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,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,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,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,500a73786885a24cfc7cc13dbe76bcc724b585e0a32c72d92d0ca73e1b253e9d,Tests_passed,cc8601b412006067ba7ef2ee41af02833d85d2fa1b26fe1cb2b888c6f8a31c26,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,0.05210590362548828,0.010829687118530273,0.0750577449798584,0.01726078987121582,0.07459902763366699,0.07420802116394043,0.07422351837158203,0.12136220932006836,0.10771298408508301,0.6795861721038818,0.3673839569091797,0.03417229652404785,0.060286760330200195,0.034705400466918945,0.05952715873718262,0.0596921443939209,0.05884552001953125,0.05975961685180664,0.05997490882873535,0.06224489212036133,0.06080007553100586,0.06000924110412598,0.0597383975982666,0.09603524208068848,0.09404587745666504,0.8999805450439453,0.40170741081237793,0.15523886680603027,0.06171727180480957,0.058989524841308594,0.06108880043029785,0.06193876266479492 diff --git a/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv b/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv index a69862418c..3c7f8607ae 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,True,5,28,211,4,True,5,Tests_passed,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,True,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,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,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,Tests_passed,db3e81309e8b370d6ec8d61847b84461779c20da8703807e3bf528debe4d500a,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,72d469e208b39a5104ca663dc245ed061f6c68337e7cede9b600ddcd72ee3539,Tests_failed,90a6490619634425c2020ed5296a59fee3b65b39b222e6feadc3de754ca35072,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,0.008908271789550781,0.008632421493530273,0.008543014526367188,0.013610363006591797,0.008449316024780273,0.008656978607177734,0.008474349975585938,0.05517172813415527,0.17368555068969727,1.6673476696014404,0.6758959293365479,0.0464630126953125,0.09336304664611816,0.04091072082519531,0.09536218643188477,0.09712815284729004 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,True,5,28,211,4,True,5,Tests_passed,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,True,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,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,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,Tests_passed,db3e81309e8b370d6ec8d61847b84461779c20da8703807e3bf528debe4d500a,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,72d469e208b39a5104ca663dc245ed061f6c68337e7cede9b600ddcd72ee3539,Tests_failed,90a6490619634425c2020ed5296a59fee3b65b39b222e6feadc3de754ca35072,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,Tests_passed,c19702f9079ba525efb2b14bbeb8bdd2371901e9d73aeb5e12ea2316984772ea,0.008908271789550781,0.008632421493530273,0.008543014526367188,0.013610363006591797,0.008449316024780273,0.008656978607177734,0.008474349975585938,0.05517172813415527,0.17368555068969727,1.6673476696014404,0.6758959293365479,0.0464630126953125,0.09336304664611816,0.04091072082519531,0.09536218643188477,0.09712815284729004,0.0912466049194336,0.09195995330810547,0.08976244926452637,0.08986592292785645,0.08826088905334473,0.09170889854431152,0.09117484092712402,0.15278124809265137,0.1788778305053711,1.7986526489257812,0.7709274291992188,0.09266853332519531,0.0902414321899414,0.09374809265136719,0.09090185165405273,0.09117698669433594 diff --git a/results/combined/merges_timed/entertailion/fling.csv b/results/combined/merges_timed/entertailion/fling.csv index 2b45264c5f..6ce62ceb69 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,True,5,73,394,3,True,5,Tests_passed,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,True,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,True,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,1bd2fee6fb6cb8d155d14f04533f07ed4683a901d03820192e94a515414a7758,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,30b3d82b91ce8df3d2c8284ed61eef0e98d7e645fd2f708b30c40c449f5646aa,Tests_passed,2bc602a4925db3bcd12cf9ebe181851b3ee33f7f65b96ad8c5b523a4e51ca69b,Merge_failed,ead99512e6312757d68950b984913730da7b04de01cf9fcd8b01888bf764a481,Tests_failed,90f8a3d0a418e876578c1156bd5f95af232f5861fd597971027bd1276931460b,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,0.03547406196594238,0.037618398666381836,0.049985647201538086,0.04829144477844238,0.04063534736633301,0.04838275909423828,0.04060220718383789,0.2010505199432373,0.16841650009155273,2.0954716205596924,0.5666289329528809,0.09608101844787598,0.0927269458770752,0.09619617462158203,0.10025167465209961,0.10294127464294434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,True,5,73,394,3,True,5,Tests_passed,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,True,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,True,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,1bd2fee6fb6cb8d155d14f04533f07ed4683a901d03820192e94a515414a7758,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,30b3d82b91ce8df3d2c8284ed61eef0e98d7e645fd2f708b30c40c449f5646aa,Tests_passed,2bc602a4925db3bcd12cf9ebe181851b3ee33f7f65b96ad8c5b523a4e51ca69b,Merge_failed,ead99512e6312757d68950b984913730da7b04de01cf9fcd8b01888bf764a481,Tests_failed,90f8a3d0a418e876578c1156bd5f95af232f5861fd597971027bd1276931460b,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,Merge_failed,7ba5a7ce0ce03dd5732c1bc12e1d5ba1a39fdbe904f273a2b9c08a910ef9c2a2,0.03547406196594238,0.037618398666381836,0.049985647201538086,0.04829144477844238,0.04063534736633301,0.04838275909423828,0.04060220718383789,0.2010505199432373,0.16841650009155273,2.0954716205596924,0.5666289329528809,0.09608101844787598,0.0927269458770752,0.09619617462158203,0.10025167465209961,0.10294127464294434,0.10004353523254395,0.10233831405639648,0.10468077659606934,0.10199737548828125,0.10459375381469727,0.107391357421875,0.11130309104919434,0.1634833812713623,0.20970988273620605,2.054328203201294,0.6472628116607666,0.10283136367797852,0.09882402420043945,0.09794974327087402,0.10988855361938477,0.10104489326477051 diff --git a/results/combined/merges_timed/erudika/para.csv b/results/combined/merges_timed/erudika/para.csv index 5762e52c5d..4608b72005 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,True,15,136,1141,2,True,15,Tests_passed,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,True,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,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_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,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_failed,88ddf9b21616efe258e6a94340555d63fdd4bc9732aef11e7c89f0e72643e9ea,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,0.020289897918701172,0.020859479904174805,0.025948524475097656,0.034502267837524414,0.025193214416503906,0.012307405471801758,0.025480985641479492,0.05709505081176758,0.07608604431152344,1.0855302810668945,0.8454701900482178,0.038213491439819336,0.08851480484008789,0.039443254470825195,0.08404207229614258,0.08651924133300781 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,True,15,136,1141,2,True,15,Tests_passed,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,True,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,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_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,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_failed,88ddf9b21616efe258e6a94340555d63fdd4bc9732aef11e7c89f0e72643e9ea,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,0.020289897918701172,0.020859479904174805,0.025948524475097656,0.034502267837524414,0.025193214416503906,0.012307405471801758,0.025480985641479492,0.05709505081176758,0.07608604431152344,1.0855302810668945,0.8454701900482178,0.038213491439819336,0.08851480484008789,0.039443254470825195,0.08404207229614258,0.08651924133300781,0.09024667739868164,0.08634638786315918,0.07172536849975586,0.08306169509887695,0.09133434295654297,0.09342837333679199,0.09496784210205078,0.10080933570861816,0.12550997734069824,1.3302278518676758,0.958216667175293,0.08511185646057129,0.08682084083557129,0.06983447074890137,0.08557391166687012,0.07789087295532227 diff --git a/results/combined/merges_timed/esapi/esapi-java-legacy.csv b/results/combined/merges_timed/esapi/esapi-java-legacy.csv index 4fd8a54a9d..1df5e4c498 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,True,19,106,607,6,True,19,Tests_passed,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,True,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,True,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,807b5a9b20265f3e7134aa64bce423b1f473da9c52bb350c65bdaa246c80f873,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,37196ff31dc34ebe74a1cba9551844b8eaebe7ea2650792809dfa5a848bc12c5,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3d30f352bd0fe494431b362d923dc00f9b783b8e8affd8f16fab1a96d85fc5e3,Merge_failed,bb62994e0dc327248c5c697da854a0e95d5f787f1c07a84a36201103d92aea77,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,0.07089614868164062,0.058800458908081055,0.058240652084350586,0.02447509765625,0.04885530471801758,0.06300234794616699,0.045317649841308594,0.4621601104736328,0.3727247714996338,0.047197580337524414,0.76316237449646,0.06812191009521484,0.13178396224975586,0.06406903266906738,0.13581633567810059,0.13648509979248047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,True,19,106,607,6,True,19,Tests_passed,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,True,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,True,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,807b5a9b20265f3e7134aa64bce423b1f473da9c52bb350c65bdaa246c80f873,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,37196ff31dc34ebe74a1cba9551844b8eaebe7ea2650792809dfa5a848bc12c5,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3d30f352bd0fe494431b362d923dc00f9b783b8e8affd8f16fab1a96d85fc5e3,Merge_failed,bb62994e0dc327248c5c697da854a0e95d5f787f1c07a84a36201103d92aea77,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,3ce85ba07720ba3161d36c5f09aeaca5af42745c500d5636d23039feb16ca1f1,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,0.07089614868164062,0.058800458908081055,0.058240652084350586,0.02447509765625,0.04885530471801758,0.06300234794616699,0.045317649841308594,0.4621601104736328,0.3727247714996338,0.047197580337524414,0.76316237449646,0.06812191009521484,0.13178396224975586,0.06406903266906738,0.13581633567810059,0.13648509979248047,0.136000394821167,0.1363999843597412,0.13546180725097656,0.13869094848632812,0.13874220848083496,0.13630414009094238,0.13584113121032715,0.24329257011413574,0.28560423851013184,0.149017333984375,0.9235339164733887,0.1319124698638916,0.13578581809997559,0.13324594497680664,0.1361536979675293,0.13631606101989746 diff --git a/results/combined/merges_timed/eskatos/asadmin.csv b/results/combined/merges_timed/eskatos/asadmin.csv index 98cbf158f9..86e6ac88aa 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,True,True,Tests_passed,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,True,34,73,669,4,True,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,True,34,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,0d392409d46e8102560a03f2319a08e58a8eded186b836a18ba5553539888a6e,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_timedout,,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,bfe95e14834f3efe8280c9533d93367c0dcfa2ebb2a1f715e57522d8608650c4,Merge_failed,452dcb82f0b63f2d65ce8a793a3e21282fd22b348c496518988474cc7db43c01,Merge_failed,862acd38d0dca8016ad845048f33bd4c84855a2714e0fc3538c03cd4e4c41fe0,Merge_timedout,,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,0.010306835174560547,0.010768413543701172,0.010613441467285156,0.018094539642333984,0.010295391082763672,0.010524749755859375,0.010573863983154297,0.060010671615600586,0.17683839797973633,1.5466187000274658,-1.0,0.04393124580383301,0.08474230766296387,0.04510188102722168,0.08569788932800293,0.08345246315002441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,True,True,Tests_passed,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,True,34,73,669,4,True,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,True,34,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,0d392409d46e8102560a03f2319a08e58a8eded186b836a18ba5553539888a6e,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_timedout,,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,bfe95e14834f3efe8280c9533d93367c0dcfa2ebb2a1f715e57522d8608650c4,Merge_failed,452dcb82f0b63f2d65ce8a793a3e21282fd22b348c496518988474cc7db43c01,Merge_failed,862acd38d0dca8016ad845048f33bd4c84855a2714e0fc3538c03cd4e4c41fe0,Merge_timedout,,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,4d4c2e6d630c55fb0cda4ceeac121216d5b3c194851525e96efde078b92a76cc,Merge_failed,27bc381a50faca515cb766829cfcf935b07fa17659892fa1e5c0be4b44f4d58f,0.010306835174560547,0.010768413543701172,0.010613441467285156,0.018094539642333984,0.010295391082763672,0.010524749755859375,0.010573863983154297,0.060010671615600586,0.17683839797973633,1.5466187000274658,-1.0,0.04393124580383301,0.08474230766296387,0.04510188102722168,0.08569788932800293,0.08345246315002441,0.08237814903259277,0.08516168594360352,0.08473563194274902,0.08358430862426758,0.08408641815185547,0.08300423622131348,0.08455419540405273,0.1520991325378418,0.173783540725708,1.7942540645599365,-1.0,0.08358430862426758,0.08106040954589844,0.08292388916015625,0.08220362663269043,0.08300185203552246 diff --git a/results/combined/merges_timed/esotericsoftware/kryo.csv b/results/combined/merges_timed/esotericsoftware/kryo.csv index 5ca8bf0132..5c7215a26c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,True,True,Tests_passed,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,True,18,54,1905,3,True,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,True,18,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,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,d0791e6b5b8be33cd877b26b0b434ff67611b2e6742a2cb0e8f09074598b79a8,Tests_failed,1206313385e506921a4abefb3de50029b9250d72ada34edad62073b51503b9f4,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.09328269958496094,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.14506936073303223,3.589958667755127,0.797903299331665,0.05810880661010742,0.10186100006103516,0.1468198299407959,0.22133779525756836,0.10004806518554688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,True,True,Tests_passed,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,True,18,54,1905,3,True,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,True,18,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,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,d0791e6b5b8be33cd877b26b0b434ff67611b2e6742a2cb0e8f09074598b79a8,Tests_failed,1206313385e506921a4abefb3de50029b9250d72ada34edad62073b51503b9f4,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,Tests_passed,b5c295219e13c49f4092e5356d0e03413328bbc4493e37d0fdd0a8ab6853eb38,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.09328269958496094,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.14506936073303223,3.589958667755127,0.797903299331665,0.05810880661010742,0.10186100006103516,0.1468198299407959,0.22133779525756836,0.10004806518554688,0.20290875434875488,0.11004042625427246,0.2346351146697998,0.2295241355895996,0.11993622779846191,0.23350238800048828,0.12229490280151367,0.3260691165924072,0.14971923828125,3.5127205848693848,0.8603909015655518,0.2065422534942627,0.20499634742736816,0.09121823310852051,0.20450782775878906,0.205413818359375 diff --git a/results/combined/merges_timed/evil-co/nbt-lib.csv b/results/combined/merges_timed/evil-co/nbt-lib.csv index fb46cbe79c..119547a6b9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,True,True,Tests_passed,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,True,8,11,341,2,True,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,True,8,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,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,72de0bdc26892c6e275aea92e7be13d9384232535cc5f8aaaf085613add69c69,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,0.041155338287353516,0.04185056686401367,0.0459592342376709,0.015501260757446289,0.039780616760253906,0.04795503616333008,0.04665517807006836,0.1615607738494873,0.10815644264221191,0.6474430561065674,0.28359246253967285,0.03129911422729492,0.057642221450805664,0.031110286712646484,0.056372642517089844,0.056432485580444336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,True,True,Tests_passed,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,True,8,11,341,2,True,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,True,8,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,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,72de0bdc26892c6e275aea92e7be13d9384232535cc5f8aaaf085613add69c69,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,Tests_passed,2bc3c32ecacf69ed282ac7d3ba2a27ec667f0b32582ea9a26378e67f4a5960c9,0.041155338287353516,0.04185056686401367,0.0459592342376709,0.015501260757446289,0.039780616760253906,0.04795503616333008,0.04665517807006836,0.1615607738494873,0.10815644264221191,0.6474430561065674,0.28359246253967285,0.03129911422729492,0.057642221450805664,0.031110286712646484,0.056372642517089844,0.056432485580444336,0.05662393569946289,0.05620098114013672,0.057823896408081055,0.05743885040283203,0.05628228187561035,0.05462932586669922,0.05739259719848633,0.0889577865600586,0.09258699417114258,0.7340269088745117,0.3430449962615967,0.05759692192077637,0.057720184326171875,0.0571596622467041,0.05603384971618652,0.056284189224243164 diff --git a/results/combined/merges_timed/evolute-pt/dbtransfer.csv b/results/combined/merges_timed/evolute-pt/dbtransfer.csv index 6053ef482a..91b8457c49 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,False,True,4,7,21,2,True,4,Tests_passed,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,True,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,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,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,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,cc9d4e1081c1e8b4a6a4660fbd61bd4fa9a8e313858a064871ce6bc5209da491,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,0.03874540328979492,0.039444923400878906,0.04325580596923828,0.021239519119262695,0.04201626777648926,0.04303312301635742,0.053762197494506836,0.16734933853149414,0.11022281646728516,0.7466912269592285,0.3116888999938965,0.038111209869384766,0.062230587005615234,0.039511680603027344,0.06022238731384277,0.06281375885009766 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,False,True,4,7,21,2,True,4,Tests_passed,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,True,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,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,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,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,cc9d4e1081c1e8b4a6a4660fbd61bd4fa9a8e313858a064871ce6bc5209da491,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,0.03874540328979492,0.039444923400878906,0.04325580596923828,0.021239519119262695,0.04201626777648926,0.04303312301635742,0.053762197494506836,0.16734933853149414,0.11022281646728516,0.7466912269592285,0.3116888999938965,0.038111209869384766,0.062230587005615234,0.039511680603027344,0.06022238731384277,0.06281375885009766,0.05916452407836914,0.0647587776184082,0.0636742115020752,0.06699800491333008,0.06437969207763672,0.06544089317321777,0.06385135650634766,0.09894156455993652,0.0917978286743164,0.9287970066070557,0.3614933490753174,0.06303286552429199,0.05915212631225586,0.0624542236328125,0.057688236236572266,0.062374114990234375 diff --git a/results/combined/merges_timed/facebook/jcommon.csv b/results/combined/merges_timed/facebook/jcommon.csv index 98053dc295..a55c3aaa66 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,False,True,2,1,15,56,True,56,Tests_passed,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,True,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,True,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,34b0252300999fa6857f47c7d59a966a031b61a8f9fbf03b9fc612aaadc3f9db,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,b6cd98cd40f4116aa03de1db5efe82d6d11570c07d9cb9a2485b461f3434fc3d,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,0.0442960262298584,0.0422205924987793,0.04870772361755371,0.015712499618530273,0.04713320732116699,0.041602373123168945,0.04898428916931152,0.18981480598449707,0.11458325386047363,0.37732839584350586,0.4186391830444336,0.03522133827209473,0.03707551956176758,0.03490018844604492,0.03552985191345215,0.03668546676635742 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,False,True,2,1,15,56,True,56,Tests_passed,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,True,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,True,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,34b0252300999fa6857f47c7d59a966a031b61a8f9fbf03b9fc612aaadc3f9db,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,b6cd98cd40f4116aa03de1db5efe82d6d11570c07d9cb9a2485b461f3434fc3d,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,0.0442960262298584,0.0422205924987793,0.04870772361755371,0.015712499618530273,0.04713320732116699,0.041602373123168945,0.04898428916931152,0.18981480598449707,0.11458325386047363,0.37732839584350586,0.4186391830444336,0.03522133827209473,0.03707551956176758,0.03490018844604492,0.03552985191345215,0.03668546676635742,0.03461170196533203,0.03520393371582031,0.033643245697021484,0.03561592102050781,0.03541064262390137,0.03426957130432129,0.03422665596008301,0.0694584846496582,0.06852555274963379,0.3757352828979492,0.44806981086730957,0.03562045097351074,0.03512883186340332,0.035124778747558594,0.03392982482910156,0.03468632698059082 diff --git a/results/combined/merges_timed/farin/jcloisterzone.csv b/results/combined/merges_timed/farin/jcloisterzone.csv index e2eff805d0..a4628c787f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -162,refs/remotes/origin/pull/424,692611d036c53048b40f0ae2e2dfc355fc6857d5,f300fd0e0191b01f896285e63d3e2cb20365b462,7b111ccf25aec8ad2ffa2c9aa38e029afb307c67,,True,True,True,162,629,3476,7,True,162,Tests_passed,922784f72bcff874542607f5a4edfc07a3be2fa5541f0c6b5b5c6bae508dc338,True,Tests_passed,c41f92820892fd717eac1eb9a78e25cf063ef79c40a4b86980d2189f70a25940,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,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,Tests_failed,4e67774444d7d8766b648f66b9f952d503d901ef756efc840fb0c19f195b0c7d,Merge_failed,06235cc7f164483fd3c513211127260f19df75f45a80cab1c371155d8ed5350f,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,02aadc40462772331ad5f350b39039b9437c04698efc5d81994d59880265a331,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Tests_failed,aecfffa2800d349fa84194f37e3757909e11c54d591d55b2bc0daeb21f54462b,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,0.03763532638549805,0.04555106163024902,0.0268862247467041,0.05539107322692871,0.03435039520263672,0.058196067810058594,0.040975332260131836,0.5269646644592285,0.3893575668334961,0.04566621780395508,3.462366819381714,0.10119843482971191,0.15423989295959473,0.1158759593963623,0.16282439231872559,0.14936494827270508 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +162,refs/remotes/origin/pull/424,692611d036c53048b40f0ae2e2dfc355fc6857d5,f300fd0e0191b01f896285e63d3e2cb20365b462,7b111ccf25aec8ad2ffa2c9aa38e029afb307c67,,True,True,True,162,629,3476,7,True,162,Tests_passed,922784f72bcff874542607f5a4edfc07a3be2fa5541f0c6b5b5c6bae508dc338,True,Tests_passed,c41f92820892fd717eac1eb9a78e25cf063ef79c40a4b86980d2189f70a25940,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,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,Tests_failed,4e67774444d7d8766b648f66b9f952d503d901ef756efc840fb0c19f195b0c7d,Merge_failed,06235cc7f164483fd3c513211127260f19df75f45a80cab1c371155d8ed5350f,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,02aadc40462772331ad5f350b39039b9437c04698efc5d81994d59880265a331,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Tests_failed,aecfffa2800d349fa84194f37e3757909e11c54d591d55b2bc0daeb21f54462b,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,0.03763532638549805,0.04555106163024902,0.0268862247467041,0.05539107322692871,0.03435039520263672,0.058196067810058594,0.040975332260131836,0.5269646644592285,0.3893575668334961,0.04566621780395508,3.462366819381714,0.10119843482971191,0.15423989295959473,0.1158759593963623,0.16282439231872559,0.14936494827270508,0.14765262603759766,0.1390385627746582,0.17833423614501953,0.15164566040039062,0.1575782299041748,0.15210270881652832,0.15366315841674805,0.27466750144958496,0.3279249668121338,0.16731786727905273,3.700481414794922,0.17491745948791504,0.15265560150146484,0.15351247787475586,0.17110252380371094,0.1409599781036377 diff --git a/results/combined/merges_timed/fasseg/exp4j.csv b/results/combined/merges_timed/fasseg/exp4j.csv index 8a4a11c92a..74a597905c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,Tests_passed,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,True,5,5,211,2,True,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,True,5,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,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,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,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,3661531e6f136bedd1e42ab913220ac2ede9e9029a29ae27706d0036cd048c12,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,0.03407907485961914,0.03773760795593262,0.041219472885131836,0.017421245574951172,0.04759716987609863,0.04812335968017578,0.04000091552734375,0.16980814933776855,0.1086575984954834,0.8141613006591797,0.6661968231201172,0.033246755599975586,0.058278799057006836,0.03376507759094238,0.05882120132446289,0.0590970516204834 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,Tests_passed,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,True,5,5,211,2,True,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,True,5,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,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,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,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,3661531e6f136bedd1e42ab913220ac2ede9e9029a29ae27706d0036cd048c12,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,0.03407907485961914,0.03773760795593262,0.041219472885131836,0.017421245574951172,0.04759716987609863,0.04812335968017578,0.04000091552734375,0.16980814933776855,0.1086575984954834,0.8141613006591797,0.6661968231201172,0.033246755599975586,0.058278799057006836,0.03376507759094238,0.05882120132446289,0.0590970516204834,0.05525779724121094,0.05461478233337402,0.05657529830932617,0.05779433250427246,0.05651998519897461,0.05518794059753418,0.05600309371948242,0.08851814270019531,0.08688640594482422,0.8368246555328369,0.7264764308929443,0.05634808540344238,0.05619335174560547,0.053023576736450195,0.05545449256896973,0.05429267883300781 diff --git a/results/combined/merges_timed/fasterxml/aalto-xml.csv b/results/combined/merges_timed/fasterxml/aalto-xml.csv index 2d7fe50862..014a779405 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,Tests_passed,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,True,58,697,15326,3,True,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,True,58,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,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,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,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,3539792eafaa0a3d0ad3387b8c4827772af6a48718d73d85f6ea078aa7cc96f9,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,0.052812814712524414,0.045949697494506836,0.04802393913269043,0.04593777656555176,0.05816173553466797,0.04066300392150879,0.0443880558013916,0.23908758163452148,0.17162108421325684,3.8509085178375244,3.677912473678589,0.07351994514465332,0.14026618003845215,0.07000494003295898,0.1262810230255127,0.13541007041931152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,Tests_passed,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,True,58,697,15326,3,True,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,True,58,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,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,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,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,3539792eafaa0a3d0ad3387b8c4827772af6a48718d73d85f6ea078aa7cc96f9,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,0.052812814712524414,0.045949697494506836,0.04802393913269043,0.04593777656555176,0.05816173553466797,0.04066300392150879,0.0443880558013916,0.23908758163452148,0.17162108421325684,3.8509085178375244,3.677912473678589,0.07351994514465332,0.14026618003845215,0.07000494003295898,0.1262810230255127,0.13541007041931152,0.13811445236206055,0.1333603858947754,0.14604496955871582,0.14703845977783203,0.14653611183166504,0.13367748260498047,0.14647746086120605,0.18821263313293457,0.19843053817749023,3.6467764377593994,3.8372488021850586,0.12955808639526367,0.14011740684509277,0.14288663864135742,0.11983180046081543,0.1296534538269043 diff --git a/results/combined/merges_timed/fasterxml/jackson-annotations.csv b/results/combined/merges_timed/fasterxml/jackson-annotations.csv index 784c4c6cde..c727f9f71d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,6,21,194,3,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,6,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,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,72cd22a34356c6c2bb42003841b7118141f442bf3ed610d15a7807071972aca4,Merge_timedout,,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.017899751663208008,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.1224527359008789,1.7738518714904785,-1.0,0.0341799259185791,0.0821387767791748,0.03358721733093262,0.08241057395935059,0.08205056190490723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,6,21,194,3,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,6,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,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,72cd22a34356c6c2bb42003841b7118141f442bf3ed610d15a7807071972aca4,Merge_timedout,,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,Tests_passed,6ab9f3a3d73077a91d4630c53968dad2cdb5330afe6f2bd3943c60e4dc86f5a4,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.017899751663208008,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.1224527359008789,1.7738518714904785,-1.0,0.0341799259185791,0.0821387767791748,0.03358721733093262,0.08241057395935059,0.08205056190490723,0.07859444618225098,0.07980775833129883,0.0778810977935791,0.08037137985229492,0.08026385307312012,0.08167362213134766,0.0782613754272461,0.12638068199157715,0.1317605972290039,1.6911134719848633,-1.0,0.07733845710754395,0.07693052291870117,0.07811522483825684,0.07955098152160645,0.07868814468383789 diff --git a/results/combined/merges_timed/fasterxml/jackson-core.csv b/results/combined/merges_timed/fasterxml/jackson-core.csv index 7d17ae393c..73b2a1e57e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,True,True,Tests_passed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,True,398,5131,45831.0,2,True,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,True,398,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,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.13089871406555176,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.05678963661193848,0.060007333755493164,10.814139366149902,0.1086735725402832,0.1509261131286621,0.10787272453308105,0.1463606357574463,0.14891648292541504 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,True,True,Tests_passed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,True,398,5131,45831.0,2,True,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,True,398,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,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.13089871406555176,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.05678963661193848,0.060007333755493164,10.814139366149902,0.1086735725402832,0.1509261131286621,0.10787272453308105,0.1463606357574463,0.14891648292541504,0.14684247970581055,0.14134597778320312,0.21582794189453125,0.2112278938293457,0.21227598190307617,0.213759183883667,0.20889520645141602,0.18047332763671875,0.16072726249694824,0.16422677040100098,11.37609601020813,0.14169645309448242,0.14229893684387207,0.14385557174682617,0.14586472511291504,0.14075875282287598 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv index 17cf6def8f..f3fff3226e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,True,True,True,9,48,251,5,True,10,Tests_passed,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,True,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,True,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,7c4eef4405a51bfe9304e04a06e2df73e3b9467b9bb112229ce8bf218bb0adf2,Merge_failed,39b5ad12d84915371f2fd9bb38b97e47514a0cc5cff1161a7c3bc9f58f4e7b3c,Merge_failed,7364d3f97bf3fcb7e39d0fd0d3d93f7aac96f3678b90d7c72a0607a39af31cab,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,0.04259347915649414,0.04248166084289551,0.04180598258972168,0.016483783721923828,0.04710721969604492,0.04637885093688965,0.04692697525024414,0.2886543273925781,0.22918128967285156,0.5585448741912842,0.4887368679046631,0.06044268608093262,0.06082963943481445,0.061907052993774414,0.06988978385925293,0.06952357292175293 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,True,True,True,9,48,251,5,True,10,Tests_passed,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,True,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,True,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,7c4eef4405a51bfe9304e04a06e2df73e3b9467b9bb112229ce8bf218bb0adf2,Merge_failed,39b5ad12d84915371f2fd9bb38b97e47514a0cc5cff1161a7c3bc9f58f4e7b3c,Merge_failed,7364d3f97bf3fcb7e39d0fd0d3d93f7aac96f3678b90d7c72a0607a39af31cab,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,Merge_failed,78f44663d97e08c5060fce58c10256926c13284289d1078db53afb6b45614f10,0.04259347915649414,0.04248166084289551,0.04180598258972168,0.016483783721923828,0.04710721969604492,0.04637885093688965,0.04692697525024414,0.2886543273925781,0.22918128967285156,0.5585448741912842,0.4887368679046631,0.06044268608093262,0.06082963943481445,0.061907052993774414,0.06988978385925293,0.06952357292175293,0.06560254096984863,0.06728792190551758,0.06613326072692871,0.06526684761047363,0.06679320335388184,0.06589770317077637,0.06577038764953613,0.13003230094909668,0.15151166915893555,0.6026759147644043,0.5628190040588379,0.06732034683227539,0.06680989265441895,0.06707620620727539,0.06400942802429199,0.0662074089050293 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv index 71738ee813..4100817dd2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,True,True,Tests_passed,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,True,3,5,92,2,True,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,True,3,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,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,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,247418a7f5bdcdc9ecc2309c8c962c60179e9ae86c8dd035f19a144e8e5a226a,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,0.046172380447387695,0.04979991912841797,0.030727386474609375,0.036257028579711914,0.06687474250793457,0.05330061912536621,0.03483128547668457,0.1909496784210205,0.09320974349975586,1.6412174701690674,0.49863290786743164,0.06016182899475098,0.09046077728271484,0.06097602844238281,0.09203886985778809,0.09529733657836914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,True,True,Tests_passed,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,True,3,5,92,2,True,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,True,3,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,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,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,247418a7f5bdcdc9ecc2309c8c962c60179e9ae86c8dd035f19a144e8e5a226a,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,0.046172380447387695,0.04979991912841797,0.030727386474609375,0.036257028579711914,0.06687474250793457,0.05330061912536621,0.03483128547668457,0.1909496784210205,0.09320974349975586,1.6412174701690674,0.49863290786743164,0.06016182899475098,0.09046077728271484,0.06097602844238281,0.09203886985778809,0.09529733657836914,0.08867478370666504,0.09181809425354004,0.09627485275268555,0.09699440002441406,0.10021567344665527,0.09731817245483398,0.09749317169189453,0.14093589782714844,0.1253669261932373,1.790909767150879,0.6096410751342773,0.09095025062561035,0.09056735038757324,0.09146714210510254,0.09009814262390137,0.09128618240356445 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv index b59495131e..77ad026574 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,True,17.0,72,409.0,4,True,17,Tests_passed,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,True,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,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,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,0.04932236671447754,0.03835940361022949,0.03412175178527832,0.0207061767578125,0.039725303649902344,0.021155834197998047,0.049341678619384766,0.2911391258239746,0.23578786849975586,0.04774022102355957,0.6128988265991211,0.048799991607666016,0.08870577812194824,0.05952286720275879,0.11191582679748535,0.11183810234069824 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,True,17.0,72,409.0,4,True,17,Tests_passed,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,True,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,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,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,Tests_passed,53fc3ff9510befa6ee94a88b28755008b7143b7a4c6c0e3db760d264a07ab0b2,0.04932236671447754,0.03835940361022949,0.03412175178527832,0.0207061767578125,0.039725303649902344,0.021155834197998047,0.049341678619384766,0.2911391258239746,0.23578786849975586,0.04774022102355957,0.6128988265991211,0.048799991607666016,0.08870577812194824,0.05952286720275879,0.11191582679748535,0.11183810234069824,0.10443782806396484,0.10289168357849121,0.10746932029724121,0.10551953315734863,0.10686492919921875,0.10144996643066406,0.10366559028625488,0.17128610610961914,0.1892251968383789,0.11901307106018066,0.7041909694671631,0.09841632843017578,0.10693502426147461,0.1062784194946289,0.1044151782989502,0.0953679084777832 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv index 24deeaba68..3609c64508 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,True,21,108,643,4,True,21,Tests_passed,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,True,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,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,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,Merge_failed,b5135a0869fba4e011aa78ea39966565086b7269d1a31c9cebfe6d6112c0dfc8,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,7731da3411b9e9b87822120d18f7ddfe42b1f3aa1a94c8d7577ad08e8790e0ff,Merge_failed,422bef6bbd622bd89936c08412fe197ae84e441c9bc79a6276fb3ad2f658a99e,Merge_failed,d75019ff297539e5ad4cf0c6633e6c05620a5cc5ef90d1fbc0a49d3889685e71,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,0.011081457138061523,0.011309623718261719,0.012115478515625,0.01642918586730957,0.01241302490234375,0.01369023323059082,0.015857458114624023,0.08232736587524414,0.18680524826049805,0.7247321605682373,0.5916352272033691,0.05798506736755371,0.07656073570251465,0.053745269775390625,0.07611608505249023,0.0766291618347168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,True,21,108,643,4,True,21,Tests_passed,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,True,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,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,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,Merge_failed,b5135a0869fba4e011aa78ea39966565086b7269d1a31c9cebfe6d6112c0dfc8,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,7731da3411b9e9b87822120d18f7ddfe42b1f3aa1a94c8d7577ad08e8790e0ff,Merge_failed,422bef6bbd622bd89936c08412fe197ae84e441c9bc79a6276fb3ad2f658a99e,Merge_failed,d75019ff297539e5ad4cf0c6633e6c05620a5cc5ef90d1fbc0a49d3889685e71,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,Merge_failed,f80d88e389a2262da566e91ecd68c059328da898add2764d3f627d893c885768,0.011081457138061523,0.011309623718261719,0.012115478515625,0.01642918586730957,0.01241302490234375,0.01369023323059082,0.015857458114624023,0.08232736587524414,0.18680524826049805,0.7247321605682373,0.5916352272033691,0.05798506736755371,0.07656073570251465,0.053745269775390625,0.07611608505249023,0.0766291618347168,0.0733330249786377,0.07343220710754395,0.0732567310333252,0.07363128662109375,0.07401013374328613,0.0726461410522461,0.07267141342163086,0.13557672500610352,0.15340900421142578,0.7457032203674316,0.6482884883880615,0.07361578941345215,0.0737149715423584,0.07455253601074219,0.07279109954833984,0.07410645484924316 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv index 81757d189b..4424360faa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,True,True,True,32,169,1289,9,True,32,Tests_passed,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,True,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,True,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,9d3ad5531196a295c127a27050e1e7f8d0dc714954d79f233f34a68ec133748e,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,Merge_failed,90671a48e82d3a8c869d880bb7518cee031e97b6c112cc82b600e1c0de1e3687,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,07a0a9fafb64d26c9e8fd2adced2a1b5820ea785019a5147912fe36725a5c087,Merge_failed,a8117e5df1dab7fd8183a7627cdd6eebf99ac0492d86cbfab929198d9a14dfa8,Merge_failed,19bb277eff254aec2c3b3b3710a2ec8c7d0a8c4ad9a1dea66399cccd7a779140,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,0.04284214973449707,0.059844017028808594,0.046827077865600586,0.026506423950195312,0.03600645065307617,0.04337143898010254,0.05330395698547363,0.6151843070983887,0.537407398223877,1.913869857788086,0.5629863739013672,0.12558436393737793,0.1362450122833252,0.13327884674072266,0.1678624153137207,0.17078638076782227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,True,True,True,32,169,1289,9,True,32,Tests_passed,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,True,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,True,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,9d3ad5531196a295c127a27050e1e7f8d0dc714954d79f233f34a68ec133748e,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,Merge_failed,90671a48e82d3a8c869d880bb7518cee031e97b6c112cc82b600e1c0de1e3687,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,07a0a9fafb64d26c9e8fd2adced2a1b5820ea785019a5147912fe36725a5c087,Merge_failed,a8117e5df1dab7fd8183a7627cdd6eebf99ac0492d86cbfab929198d9a14dfa8,Merge_failed,19bb277eff254aec2c3b3b3710a2ec8c7d0a8c4ad9a1dea66399cccd7a779140,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,2b20b41a83766ffcf687f7ff2f4e5e4b4b70bb32f6f34ae658700ad212cc1b71,Merge_failed,06a1b1a92c7c5732d9511bcab269556f8a46072c8bd6948ac08e6c3b5145ab07,0.04284214973449707,0.059844017028808594,0.046827077865600586,0.026506423950195312,0.03600645065307617,0.04337143898010254,0.05330395698547363,0.6151843070983887,0.537407398223877,1.913869857788086,0.5629863739013672,0.12558436393737793,0.1362450122833252,0.13327884674072266,0.1678624153137207,0.17078638076782227,0.153214693069458,0.16416025161743164,0.16560769081115723,0.16550374031066895,0.16202402114868164,0.15447187423706055,0.16453313827514648,0.30346179008483887,0.38283324241638184,2.0693936347961426,0.7353568077087402,0.1616685390472412,0.16302204132080078,0.14926481246948242,0.16302990913391113,0.15427541732788086 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv index 2d3144a859..9174a84394 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,True,18,20,70,3,True,18,Tests_passed,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,True,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,True,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,5d9504509f2e11c35c8e0881e36b97488cf1eeea38948bd188999b9db790b5d6,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,20da737d007205668061bbdf278ccc27bdb9259950c498064f929272bc9a11ef,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,2f4f45fe6f14cb8fb5bca833f17b228276cc1fafec9b67e912be48d84187e349,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,0.031961679458618164,0.042923927307128906,0.03773808479309082,0.014591217041015625,0.039108991622924805,0.0396428108215332,0.032364845275878906,0.23830366134643555,0.16745233535766602,0.5437402725219727,0.3433964252471924,0.04213309288024902,0.06271982192993164,0.04275870323181152,0.06309175491333008,0.06319236755371094 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,True,18,20,70,3,True,18,Tests_passed,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,True,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,True,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,5d9504509f2e11c35c8e0881e36b97488cf1eeea38948bd188999b9db790b5d6,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,20da737d007205668061bbdf278ccc27bdb9259950c498064f929272bc9a11ef,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,2f4f45fe6f14cb8fb5bca833f17b228276cc1fafec9b67e912be48d84187e349,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,0.031961679458618164,0.042923927307128906,0.03773808479309082,0.014591217041015625,0.039108991622924805,0.0396428108215332,0.032364845275878906,0.23830366134643555,0.16745233535766602,0.5437402725219727,0.3433964252471924,0.04213309288024902,0.06271982192993164,0.04275870323181152,0.06309175491333008,0.06319236755371094,0.05981898307800293,0.060738325119018555,0.06170654296875,0.06195855140686035,0.061031341552734375,0.0604095458984375,0.06079554557800293,0.10863971710205078,0.1207571029663086,0.5857522487640381,0.39800047874450684,0.06147646903991699,0.06144881248474121,0.06039834022521973,0.06041073799133301,0.06055402755737305 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv index b2e3918f14..15da6ca8cf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,True,True,True,46,92,2216,2,True,46,Tests_passed,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,True,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,True,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,d93823422600c76dcee87fab803749c20d32e334cd32eba0365000c4ab010c33,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,Tests_failed,82a1bfdbc201e9b45fb787b18acb3d5801088a47f3d4d1b630ffc4725b44f47f,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,4537106548a98b1733316a6bb8e6b45216eba2ec4cac372546c34bf6297fb995,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,cec66bc4ff5258f124c2cfbe3b45764847ad5b1595afed4c0258e37922a60f58,Tests_failed,7104d8c5cba6221f11ec17954ad6aa6f06b3a76987d71584e195ac7ddd6db513,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,0.04118657112121582,0.04385638236999512,0.0443117618560791,0.018872976303100586,0.05324602127075195,0.047460079193115234,0.04049563407897949,0.17317843437194824,0.12331986427307129,0.7876060009002686,0.7045741081237793,0.05552554130554199,0.04664874076843262,0.0482177734375,0.07557916641235352,0.07526540756225586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,True,True,True,46,92,2216,2,True,46,Tests_passed,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,True,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,True,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,d93823422600c76dcee87fab803749c20d32e334cd32eba0365000c4ab010c33,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,Tests_failed,82a1bfdbc201e9b45fb787b18acb3d5801088a47f3d4d1b630ffc4725b44f47f,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,4537106548a98b1733316a6bb8e6b45216eba2ec4cac372546c34bf6297fb995,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,cec66bc4ff5258f124c2cfbe3b45764847ad5b1595afed4c0258e37922a60f58,Tests_failed,7104d8c5cba6221f11ec17954ad6aa6f06b3a76987d71584e195ac7ddd6db513,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,0.04118657112121582,0.04385638236999512,0.0443117618560791,0.018872976303100586,0.05324602127075195,0.047460079193115234,0.04049563407897949,0.17317843437194824,0.12331986427307129,0.7876060009002686,0.7045741081237793,0.05552554130554199,0.04664874076843262,0.0482177734375,0.07557916641235352,0.07526540756225586,0.07053470611572266,0.07036447525024414,0.06917333602905273,0.07321643829345703,0.07122588157653809,0.07121610641479492,0.07175230979919434,0.10199594497680664,0.11129403114318848,0.8431522846221924,0.7332959175109863,0.07167363166809082,0.07121515274047852,0.07139158248901367,0.0687401294708252,0.07321786880493164 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv b/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv index 4c0c4d16ad..50bfaf5e60 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,True,46,239,1565,2,True,46,Tests_passed,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,True,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,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,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,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,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,f85b7928ec2b5d881a430c0396eca264150411dfb91483809bd16459cabf8c66,Merge_timedout,,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,0.026530027389526367,0.02797102928161621,0.047893524169921875,0.03714275360107422,0.026084184646606445,0.03822731971740723,0.033023834228515625,0.12133049964904785,0.09550786018371582,0.7614293098449707,-1.0,0.06275749206542969,0.08546566963195801,0.06496644020080566,0.0892786979675293,0.0889122486114502 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,True,46,239,1565,2,True,46,Tests_passed,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,True,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,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,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,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,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,f85b7928ec2b5d881a430c0396eca264150411dfb91483809bd16459cabf8c66,Merge_timedout,,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,0.026530027389526367,0.02797102928161621,0.047893524169921875,0.03714275360107422,0.026084184646606445,0.03822731971740723,0.033023834228515625,0.12133049964904785,0.09550786018371582,0.7614293098449707,-1.0,0.06275749206542969,0.08546566963195801,0.06496644020080566,0.0892786979675293,0.0889122486114502,0.08576679229736328,0.08601593971252441,0.09282565116882324,0.0946359634399414,0.0929570198059082,0.09241437911987305,0.09166264533996582,0.12810826301574707,0.12255573272705078,0.7411212921142578,-1.0,0.08422517776489258,0.08298707008361816,0.08455753326416016,0.08052873611450195,0.08304882049560547 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 e71b4190a7..85e8ee8e31 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,True,True,True,7,25,187,4,True,7,Tests_passed,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,True,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,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,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,abced7c7e09cf70a2ba29e8d9174ca57213650ecf7f6a26866f3041a0aee4396,Merge_failed,c6581426e1a8004dad63016610fcd7b10f381fe7a047fa22a89701d930faaf58,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,0.04333186149597168,0.0390622615814209,0.043443918228149414,0.01632404327392578,0.05138134956359863,0.04775261878967285,0.04590249061584473,0.29018092155456543,0.23726630210876465,0.048056840896606445,0.4608650207519531,0.04265618324279785,0.08956384658813477,0.04472017288208008,0.0905606746673584,0.0905768871307373 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,True,True,True,7,25,187,4,True,7,Tests_passed,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,True,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,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,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,abced7c7e09cf70a2ba29e8d9174ca57213650ecf7f6a26866f3041a0aee4396,Merge_failed,c6581426e1a8004dad63016610fcd7b10f381fe7a047fa22a89701d930faaf58,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,Merge_failed,5bde7e8d697113000686617d4888cb05f54840573a85ae7c84546b1112a14a1d,0.04333186149597168,0.0390622615814209,0.043443918228149414,0.01632404327392578,0.05138134956359863,0.04775261878967285,0.04590249061584473,0.29018092155456543,0.23726630210876465,0.048056840896606445,0.4608650207519531,0.04265618324279785,0.08956384658813477,0.04472017288208008,0.0905606746673584,0.0905768871307373,0.08888554573059082,0.08854532241821289,0.08942842483520508,0.08932900428771973,0.08896231651306152,0.08652758598327637,0.08769464492797852,0.15294981002807617,0.1739215850830078,0.10152387619018555,0.5842108726501465,0.08797550201416016,0.08755612373352051,0.08832383155822754,0.08748650550842285,0.08683919906616211 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv b/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv index 53973e3bd3..716f9d5bcd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,True,5,10,97,2,True,5,Tests_passed,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,True,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,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,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,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,ac1fc18b175821c7f59dfe3cc068ed4455857cb709423df0f4e1816f4bc3860f,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,0.04042172431945801,0.04650521278381348,0.04604792594909668,0.01630878448486328,0.04598069190979004,0.03937888145446777,0.04473090171813965,0.16242265701293945,0.11161923408508301,0.9362280368804932,0.33698177337646484,0.03016948699951172,0.054784297943115234,0.030333995819091797,0.05456256866455078,0.05605363845825195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,True,5,10,97,2,True,5,Tests_passed,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,True,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,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,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,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,ac1fc18b175821c7f59dfe3cc068ed4455857cb709423df0f4e1816f4bc3860f,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,0.04042172431945801,0.04650521278381348,0.04604792594909668,0.01630878448486328,0.04598069190979004,0.03937888145446777,0.04473090171813965,0.16242265701293945,0.11161923408508301,0.9362280368804932,0.33698177337646484,0.03016948699951172,0.054784297943115234,0.030333995819091797,0.05456256866455078,0.05605363845825195,0.05387687683105469,0.052922964096069336,0.05532097816467285,0.05277061462402344,0.052597999572753906,0.05300164222717285,0.05337929725646973,0.08559751510620117,0.08277392387390137,0.9561238288879395,0.37748241424560547,0.05497479438781738,0.05309247970581055,0.05468034744262695,0.05298805236816406,0.05371809005737305 diff --git a/results/combined/merges_timed/feedzai/pdb.csv b/results/combined/merges_timed/feedzai/pdb.csv index 16aec5baa0..118643cfb0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,True,True,True,15,43,360,2,True,15,Tests_passed,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,True,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,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,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,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,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,e36f095c414bdc0ce231d4a3b191fe6bf98365c50a532387e531548ba81a6f20,Tests_failed,73ab7aefd9eb327ddb89ceb4941a5b5ea0c1e35ab46a431f4e528b930444f309,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,0.02088475227355957,0.021579980850219727,0.02626633644104004,0.03639578819274902,0.026197433471679688,0.0256955623626709,0.026264667510986328,0.057654380798339844,0.07651853561401367,2.069310188293457,1.4340622425079346,0.060791015625,0.10180020332336426,0.06101560592651367,0.10162234306335449,0.09789800643920898 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,True,True,True,15,43,360,2,True,15,Tests_passed,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,True,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,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,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,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,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,e36f095c414bdc0ce231d4a3b191fe6bf98365c50a532387e531548ba81a6f20,Tests_failed,73ab7aefd9eb327ddb89ceb4941a5b5ea0c1e35ab46a431f4e528b930444f309,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,0.02088475227355957,0.021579980850219727,0.02626633644104004,0.03639578819274902,0.026197433471679688,0.0256955623626709,0.026264667510986328,0.057654380798339844,0.07651853561401367,2.069310188293457,1.4340622425079346,0.060791015625,0.10180020332336426,0.06101560592651367,0.10162234306335449,0.09789800643920898,0.09759521484375,0.09415078163146973,0.10082101821899414,0.09818243980407715,0.10330891609191895,0.0975193977355957,0.10002303123474121,0.1411590576171875,0.13463807106018066,2.2793514728546143,1.2077620029449463,0.08129334449768066,0.08971071243286133,0.09885358810424805,0.0949239730834961,0.09233212471008301 diff --git a/results/combined/merges_timed/fenixedu/fenixedu-academic.csv b/results/combined/merges_timed/fenixedu/fenixedu-academic.csv index 2d3fcdc240..b684ad7d68 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,True,5,20,97.0,2,True,5,Tests_passed,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,True,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,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,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,40034fe65505b253ebbaa4f865d5c85e56aa7aecfe5369cdc7ed502ab6aca60a,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,0.03125,0.03168606758117676,0.03946065902709961,0.04926156997680664,0.038818359375,0.0392913818359375,0.039374589920043945,0.1738288402557373,0.09198904037475586,0.03481101989746094,0.4179673194885254,0.08197760581970215,0.07400989532470703,0.07731747627258301,0.07564210891723633,0.08147311210632324 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,True,5,20,97.0,2,True,5,Tests_passed,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,True,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,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,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,40034fe65505b253ebbaa4f865d5c85e56aa7aecfe5369cdc7ed502ab6aca60a,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,0.03125,0.03168606758117676,0.03946065902709961,0.04926156997680664,0.038818359375,0.0392913818359375,0.039374589920043945,0.1738288402557373,0.09198904037475586,0.03481101989746094,0.4179673194885254,0.08197760581970215,0.07400989532470703,0.07731747627258301,0.07564210891723633,0.08147311210632324,0.0811150074005127,0.08220314979553223,0.08700108528137207,0.08447480201721191,0.0857234001159668,0.08523869514465332,0.08718442916870117,0.14679217338562012,0.12758493423461914,0.10187959671020508,0.5024099349975586,0.07797956466674805,0.07833147048950195,0.07617402076721191,0.07631587982177734,0.07615828514099121 diff --git a/results/combined/merges_timed/fernandezpablo85/scribe-java.csv b/results/combined/merges_timed/fernandezpablo85/scribe-java.csv index 34cc71be85..ffdad0b022 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,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,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,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_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,33b89cf2bfadb65308a2f05d410f8eb80520274893169f6937cf88f788803bba,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.01896524429321289,0.019338607788085938,0.017484426498413086,0.026271343231201172,0.01756596565246582,0.023865938186645508,0.02378225326538086,0.05283164978027344,0.07503724098205566,0.9588253498077393,1.1883037090301514,0.043976545333862305,0.0736684799194336,0.05977964401245117,0.08583784103393555,0.08766770362854004 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,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,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,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_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,33b89cf2bfadb65308a2f05d410f8eb80520274893169f6937cf88f788803bba,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.01896524429321289,0.019338607788085938,0.017484426498413086,0.026271343231201172,0.01756596565246582,0.023865938186645508,0.02378225326538086,0.05283164978027344,0.07503724098205566,0.9588253498077393,1.1883037090301514,0.043976545333862305,0.0736684799194336,0.05977964401245117,0.08583784103393555,0.08766770362854004,0.0827949047088623,0.08533644676208496,0.07178664207458496,0.07234835624694824,0.07506060600280762,0.08809542655944824,0.08648061752319336,0.10829353332519531,0.10219335556030273,1.0525968074798584,1.2557554244995117,0.0690927505493164,0.0703120231628418,0.08259177207946777,0.08050966262817383,0.0701148509979248 diff --git a/results/combined/merges_timed/feroult/yawp.csv b/results/combined/merges_timed/feroult/yawp.csv index f6634d4ca7..382078a1a7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -108,refs/heads/master,141f79a8e9268d471b022f45d5482d5da4e75da7,160c4dc583e83ddaa8da540d2c270e93ac271bcc,652d630fd7efd74fa37071bf7249e5eb79224799,,True,True,Tests_passed,98925fde50d3097bbe3f55b588b7d8cc5e63ff3f6a3f04e5894870d32ac7f972,True,16,36,545,2,True,Tests_passed,b19174fde44da4862c195c2eb7dcc46329f7ac17c7fca781479a9e2b50bef6eb,True,16,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_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,b3a86613c273b21c0f26bdb6d6ad7e7ebf647c6e7de5c9bc45b026e33ca7becb,Tests_failed,5c675db972b2c16241528ad608d6cea16f7e0079a2ec4c90f84109146ad0bbfe,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,0.04282069206237793,0.0395660400390625,0.05755352973937988,0.017907142639160156,0.04799008369445801,0.05429220199584961,0.04327106475830078,0.16130471229553223,0.11756277084350586,0.6326107978820801,0.4458904266357422,0.03606891632080078,0.06028485298156738,0.03586745262145996,0.062332868576049805,0.0644841194152832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +108,refs/heads/master,141f79a8e9268d471b022f45d5482d5da4e75da7,160c4dc583e83ddaa8da540d2c270e93ac271bcc,652d630fd7efd74fa37071bf7249e5eb79224799,,True,True,Tests_passed,98925fde50d3097bbe3f55b588b7d8cc5e63ff3f6a3f04e5894870d32ac7f972,True,16,36,545,2,True,Tests_passed,b19174fde44da4862c195c2eb7dcc46329f7ac17c7fca781479a9e2b50bef6eb,True,16,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_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,b3a86613c273b21c0f26bdb6d6ad7e7ebf647c6e7de5c9bc45b026e33ca7becb,Tests_failed,5c675db972b2c16241528ad608d6cea16f7e0079a2ec4c90f84109146ad0bbfe,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,Tests_passed,d6304c536facf1bb7079412ba65fa7f710d9da713880737d4afcae01b637a963,0.04282069206237793,0.0395660400390625,0.05755352973937988,0.017907142639160156,0.04799008369445801,0.05429220199584961,0.04327106475830078,0.16130471229553223,0.11756277084350586,0.6326107978820801,0.4458904266357422,0.03606891632080078,0.06028485298156738,0.03586745262145996,0.062332868576049805,0.0644841194152832,0.06020045280456543,0.06121039390563965,0.0629723072052002,0.06151175498962402,0.06294512748718262,0.06102108955383301,0.06433224678039551,0.09665465354919434,0.0967557430267334,0.7895104885101318,0.5341296195983887,0.0622403621673584,0.06153726577758789,0.06140494346618652,0.06197333335876465,0.06204056739807129 diff --git a/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv b/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv index 80e42f481d..f828fb4316 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,True,True,Tests_passed,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,True,61,248,1253,17,True,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,True,71,True,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,4582f043c8ab0f51f6e8923cbdfaa827add918e4be843c66034bfd689f149742,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,Merge_failed,f576168c9cf9f34d71e47627ac045daf1b86f4ef17d301a2ede05b3aba161068,Merge_failed,0c893bceb807dd33b78e5c6cad61a06c0fadc549ef58ca4d608c5f97dbba72b3,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,ec0623e0fcda736b175402f2f3f4334d397ad9f711df030b0bb868d3b8ebc7c2,Merge_failed,3f4d8152035903af8ee28a0f37380cdd04aec81ad5e98e4cf6ecfcd563a05dfe,Merge_failed,598ae2a178dad50abdb5dc2c86c049163730fd98015370fcc2808023f7a35aa8,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,0.014391899108886719,0.014487981796264648,0.014081478118896484,0.02109217643737793,0.013503074645996094,0.013714075088500977,0.013663530349731445,0.1165616512298584,0.4714796543121338,4.386509656906128,0.6877727508544922,0.11157870292663574,0.1255934238433838,0.11219477653503418,0.16190624237060547,0.1602780818939209 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,True,True,Tests_passed,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,True,61,248,1253,17,True,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,True,71,True,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,4582f043c8ab0f51f6e8923cbdfaa827add918e4be843c66034bfd689f149742,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,Merge_failed,f576168c9cf9f34d71e47627ac045daf1b86f4ef17d301a2ede05b3aba161068,Merge_failed,0c893bceb807dd33b78e5c6cad61a06c0fadc549ef58ca4d608c5f97dbba72b3,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,ec0623e0fcda736b175402f2f3f4334d397ad9f711df030b0bb868d3b8ebc7c2,Merge_failed,3f4d8152035903af8ee28a0f37380cdd04aec81ad5e98e4cf6ecfcd563a05dfe,Merge_failed,598ae2a178dad50abdb5dc2c86c049163730fd98015370fcc2808023f7a35aa8,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,Merge_failed,f4302bb77e04e437773edd846da39f871553d825eef3a124ee34eb50a623d10d,0.014391899108886719,0.014487981796264648,0.014081478118896484,0.02109217643737793,0.013503074645996094,0.013714075088500977,0.013663530349731445,0.1165616512298584,0.4714796543121338,4.386509656906128,0.6877727508544922,0.11157870292663574,0.1255934238433838,0.11219477653503418,0.16190624237060547,0.1602780818939209,0.1597287654876709,0.169358491897583,0.16650962829589844,0.16370391845703125,0.1652851104736328,0.16219115257263184,0.16642069816589355,0.30300259590148926,0.41352295875549316,5.162475824356079,0.9507789611816406,0.16419315338134766,0.1645188331604004,0.16543149948120117,0.16735434532165527,0.16759753227233887 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 64fd87e5eb..21747778bf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,True,6,10,67,3,True,6,Tests_passed,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,True,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,True,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,811cfce7dc9171c2720b046db6239f4388e7ee566f1a49570f480d0f39eb48ea,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,856d65ddb2af9441beddc6428df9692a2f22a6184ded592c415c5fa6afb603f0,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,cbc45b1fe5424012927594ee6c82b9f070439044f64d545be8c703b8f47b61b3,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,0.0431668758392334,0.03911328315734863,0.04666328430175781,0.016853809356689453,0.03505349159240723,0.03635692596435547,0.043898582458496094,0.24208831787109375,0.1673743724822998,1.4311058521270752,0.3392043113708496,0.04194927215576172,0.06767439842224121,0.04331779479980469,0.06752181053161621,0.06993246078491211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,True,6,10,67,3,True,6,Tests_passed,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,True,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,True,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,811cfce7dc9171c2720b046db6239f4388e7ee566f1a49570f480d0f39eb48ea,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,856d65ddb2af9441beddc6428df9692a2f22a6184ded592c415c5fa6afb603f0,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,cbc45b1fe5424012927594ee6c82b9f070439044f64d545be8c703b8f47b61b3,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,0.0431668758392334,0.03911328315734863,0.04666328430175781,0.016853809356689453,0.03505349159240723,0.03635692596435547,0.043898582458496094,0.24208831787109375,0.1673743724822998,1.4311058521270752,0.3392043113708496,0.04194927215576172,0.06767439842224121,0.04331779479980469,0.06752181053161621,0.06993246078491211,0.06514286994934082,0.06722879409790039,0.06821393966674805,0.06607699394226074,0.06815671920776367,0.06662774085998535,0.0677642822265625,0.11568164825439453,0.12662696838378906,1.5595111846923828,0.4620933532714844,0.06672549247741699,0.0679163932800293,0.06803250312805176,0.06536412239074707,0.06601214408874512 diff --git a/results/combined/merges_timed/ffay/lanproxy.csv b/results/combined/merges_timed/ffay/lanproxy.csv index 6b6f3ab161..3459cfc9de 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,True,True,Tests_passed,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,True,4,7,22.0,2,True,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,True,4,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,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,eece4164e4e92447fbdf9d6298f803805f130388eb6cb3737d0f0b3e2edcc74d,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Tests_failed,b0ec1cc502018785bf057af27020829b5a67bffbef4b41b55dc3b93ce244541d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.06652402877807617,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.11230325698852539,0.6508784294128418,0.3140547275543213,0.10523390769958496,0.1013789176940918,0.10734939575195312,0.04223299026489258,0.10242080688476562 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,True,True,Tests_passed,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,True,4,7,22.0,2,True,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,True,4,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,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,eece4164e4e92447fbdf9d6298f803805f130388eb6cb3737d0f0b3e2edcc74d,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Tests_failed,b0ec1cc502018785bf057af27020829b5a67bffbef4b41b55dc3b93ce244541d,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.06652402877807617,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.11230325698852539,0.6508784294128418,0.3140547275543213,0.10523390769958496,0.1013789176940918,0.10734939575195312,0.04223299026489258,0.10242080688476562,0.09316182136535645,0.07702517509460449,0.04064440727233887,0.10557723045349121,0.10010576248168945,0.07480382919311523,0.10499930381774902,0.14236736297607422,0.14037609100341797,0.6480801105499268,0.4223322868347168,0.07055449485778809,0.09982681274414062,0.09635591506958008,0.0729522705078125,0.04075431823730469 diff --git a/results/combined/merges_timed/fiji/trackmate.csv b/results/combined/merges_timed/fiji/trackmate.csv index 11862e346f..3c3bbd11b2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,Tests_passed,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,True,34,80,1085.0,37,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,True,64,True,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,0b8af7826d26a19a6ab8cac21897eef18265b6f4cbd10aa2d4f6393eb4800052,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,1148edccb0a1b79954102ea6f6d32cb57d6253f01935ca96e0f92f1ad4ff2e19,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,ae19a86c31a151d0f67255b0fd0f1cfff16d7031e8ab3703507dc70f152e8997,Tests_failed,f18c7461c70cf9bc6ddaec259b914f7a695fed2d42dca84d279679e9fcba11c9,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,0.0162050724029541,0.03240799903869629,0.037017107009887695,0.02567744255065918,0.016564130783081055,0.03695940971374512,0.01646900177001953,0.113739013671875,0.3358147144317627,5.9245216846466064,1.4702343940734863,0.0767052173614502,0.1494920253753662,0.07598018646240234,0.1499185562133789,0.16019678115844727 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,Tests_passed,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,True,34,80,1085.0,37,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,True,64,True,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,0b8af7826d26a19a6ab8cac21897eef18265b6f4cbd10aa2d4f6393eb4800052,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,1148edccb0a1b79954102ea6f6d32cb57d6253f01935ca96e0f92f1ad4ff2e19,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,ae19a86c31a151d0f67255b0fd0f1cfff16d7031e8ab3703507dc70f152e8997,Tests_failed,f18c7461c70cf9bc6ddaec259b914f7a695fed2d42dca84d279679e9fcba11c9,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,0.0162050724029541,0.03240799903869629,0.037017107009887695,0.02567744255065918,0.016564130783081055,0.03695940971374512,0.01646900177001953,0.113739013671875,0.3358147144317627,5.9245216846466064,1.4702343940734863,0.0767052173614502,0.1494920253753662,0.07598018646240234,0.1499185562133789,0.16019678115844727,0.1521003246307373,0.160538911819458,0.15254783630371094,0.16357183456420898,0.19278407096862793,0.16447830200195312,0.19060707092285156,0.28559422492980957,0.32777929306030273,7.290747880935669,1.6567645072937012,0.15106439590454102,0.1528468132019043,0.15188932418823242,0.1511240005493164,0.16438627243041992 diff --git a/results/combined/merges_timed/fiji/trainable_segmentation.csv b/results/combined/merges_timed/fiji/trainable_segmentation.csv index ca44a99437..fc9ba3669a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,True,4,7,10.0,2,True,4,Tests_passed,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,True,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,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,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,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,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,260674facd04b4d720ef991f47be89e46f2aba2cbd9e05354db733fe79cf14b6,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,0.040007591247558594,0.043044090270996094,0.06203603744506836,0.04219698905944824,0.08842730522155762,0.04157304763793945,0.04644155502319336,0.1655900478363037,0.1105647087097168,2.788839817047119,0.7849266529083252,0.07117414474487305,0.09886050224304199,0.06714010238647461,0.10556173324584961,0.10804510116577148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,True,4,7,10.0,2,True,4,Tests_passed,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,True,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,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,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,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,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,260674facd04b4d720ef991f47be89e46f2aba2cbd9e05354db733fe79cf14b6,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,0.040007591247558594,0.043044090270996094,0.06203603744506836,0.04219698905944824,0.08842730522155762,0.04157304763793945,0.04644155502319336,0.1655900478363037,0.1105647087097168,2.788839817047119,0.7849266529083252,0.07117414474487305,0.09886050224304199,0.06714010238647461,0.10556173324584961,0.10804510116577148,0.10995173454284668,0.10691642761230469,0.11062121391296387,0.11010074615478516,0.11036944389343262,0.11585116386413574,0.11441206932067871,0.16774654388427734,0.14980435371398926,3.269794464111328,0.9412708282470703,0.10344982147216797,0.10819816589355469,0.10434651374816895,0.11026763916015625,0.10880351066589355 diff --git a/results/combined/merges_timed/fincatto/nfe.csv b/results/combined/merges_timed/fincatto/nfe.csv index d21979f2ad..49b05990ba 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -835,refs/remotes/origin/pull/707,5e7de4528cb818ec7091faf2b0ecb3c2b5ce2fbc,2546be2a39c864dc2c3e943ca41dacb87c353dae,9ea3d957c2b490adf3c090118879b16dc0771ff4,,True,True,True,73,302,1061,3,True,73,Tests_passed,246a868ce80bbe7b6d29433fda56c0511e826871f08f32a1fba19d8421b4bf50,True,Tests_passed,d05337513dd4940ef9a686d903012fed339c5498230f53dca15eb5844d0005c0,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_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_failed,c814a105483ba74f140ebfddf9846683eeedb77f06adaaea9b92545b8051f30b,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_failed,c8ba2407bae56915e521ae919d6d0457aacef18bb3505159f7232f47ff5a8871,Tests_failed,c814a105483ba74f140ebfddf9846683eeedb77f06adaaea9b92545b8051f30b,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,0.08133625984191895,0.07203006744384766,0.07176566123962402,0.05686521530151367,0.07157540321350098,0.08571648597717285,0.060602664947509766,0.27538561820983887,0.16923141479492188,2.3378236293792725,9.018836736679077,0.09600234031677246,0.1556849479675293,0.0967409610748291,0.15634679794311523,0.15296316146850586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +835,refs/remotes/origin/pull/707,5e7de4528cb818ec7091faf2b0ecb3c2b5ce2fbc,2546be2a39c864dc2c3e943ca41dacb87c353dae,9ea3d957c2b490adf3c090118879b16dc0771ff4,,True,True,True,73,302,1061,3,True,73,Tests_passed,246a868ce80bbe7b6d29433fda56c0511e826871f08f32a1fba19d8421b4bf50,True,Tests_passed,d05337513dd4940ef9a686d903012fed339c5498230f53dca15eb5844d0005c0,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_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_failed,c814a105483ba74f140ebfddf9846683eeedb77f06adaaea9b92545b8051f30b,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_failed,c8ba2407bae56915e521ae919d6d0457aacef18bb3505159f7232f47ff5a8871,Tests_failed,c814a105483ba74f140ebfddf9846683eeedb77f06adaaea9b92545b8051f30b,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,Tests_passed,ae4112e9e5b904497ea4febb5d15f65c3cbf94549c06f6973af90959d1ef961a,0.08133625984191895,0.07203006744384766,0.07176566123962402,0.05686521530151367,0.07157540321350098,0.08571648597717285,0.060602664947509766,0.27538561820983887,0.16923141479492188,2.3378236293792725,9.018836736679077,0.09600234031677246,0.1556849479675293,0.0967409610748291,0.15634679794311523,0.15296316146850586,0.14953970909118652,0.1543419361114502,0.15759778022766113,0.15479636192321777,0.15728306770324707,0.1563713550567627,0.15535640716552734,0.24134516716003418,0.21852612495422363,2.352334499359131,8.691416501998901,0.14899539947509766,0.14754676818847656,0.14915013313293457,0.15157365798950195,0.1508166790008545 diff --git a/results/combined/merges_timed/findwise/hydra.csv b/results/combined/merges_timed/findwise/hydra.csv index dcd8755876..2687b190bf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,True,37,175,2858.0,4,True,37,Tests_passed,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,65ece4cbe113fa0032900863396bd81633ffa115b20b35ff08c974c9d73f03d0,Merge_failed,7e810c5d86a009cdcc60b1b2249ad077c5d650b82d00f5f0203af41c55ae499d,Merge_failed,c1e8efcf04767e4690f1c9dad3c7e6ea3497f29330a76fa921272cbdb1525be5,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,0.01828479766845703,0.018651723861694336,0.020518779754638672,0.03160381317138672,0.020628690719604492,0.012771844863891602,0.020766019821166992,0.0773475170135498,0.18241477012634277,0.48815369606018066,0.7691125869750977,0.06514716148376465,0.09254884719848633,0.06674814224243164,0.10387229919433594,0.08736848831176758 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,True,37,175,2858.0,4,True,37,Tests_passed,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,65ece4cbe113fa0032900863396bd81633ffa115b20b35ff08c974c9d73f03d0,Merge_failed,7e810c5d86a009cdcc60b1b2249ad077c5d650b82d00f5f0203af41c55ae499d,Merge_failed,c1e8efcf04767e4690f1c9dad3c7e6ea3497f29330a76fa921272cbdb1525be5,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,20be3783a49311389c5d48d85f0b82589435fc53549c9e0ebcb7e4faf01594f3,Merge_failed,2ee9d2b7eceef6561eed0cbcdec4693855495a1501e0c7e29aeb58fc29188a69,0.01828479766845703,0.018651723861694336,0.020518779754638672,0.03160381317138672,0.020628690719604492,0.012771844863891602,0.020766019821166992,0.0773475170135498,0.18241477012634277,0.48815369606018066,0.7691125869750977,0.06514716148376465,0.09254884719848633,0.06674814224243164,0.10387229919433594,0.08736848831176758,0.0944209098815918,0.08189725875854492,0.10149598121643066,0.08446145057678223,0.09674930572509766,0.09713864326477051,0.0855555534362793,0.16737914085388184,0.16693496704101562,0.5737307071685791,0.8549637794494629,0.09543418884277344,0.08949112892150879,0.09672236442565918,0.08636713027954102,0.08906292915344238 diff --git a/results/combined/merges_timed/finraos/jtaf-xcore.csv b/results/combined/merges_timed/finraos/jtaf-xcore.csv index 124da30d55..534e3c5d93 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,True,125,584,3062,7,True,125,Tests_passed,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,True,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e14683a7cdd27a98d3ae63d05b0dcd1bef3f04d1e2cd2841cd3fe426ded266fd,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,Merge_failed,f04f85e29c0d8dc9acbdd01b459659b5a266e8c19545781ff2e608579a2318af,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,38e04b12e197b7d6881dba870693c3737f3a0e23145b47225f29be90c9e948ed,Tests_passed,70c5e33a3d73b67069b37165f432373847077940368cc6f54a2ddaf75e480b48,Tests_passed,7a210c6b3182c505d7bc2e11194b38ca5b500ec924df2ce82ba344ed3817d60c,Tests_failed,433be0637d9bab676135af0fc62d6fab16dd065bc4ffa1a6c5f0a5768022e985,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,0.057038307189941406,0.061199188232421875,0.05856466293334961,0.02617788314819336,0.055234670639038086,0.05297589302062988,0.06425642967224121,0.4574577808380127,0.4263279438018799,4.292613983154297,0.9370927810668945,0.09970688819885254,0.12987518310546875,0.09242439270019531,0.12997126579284668,0.13328051567077637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,True,125,584,3062,7,True,125,Tests_passed,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,True,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e14683a7cdd27a98d3ae63d05b0dcd1bef3f04d1e2cd2841cd3fe426ded266fd,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,Merge_failed,f04f85e29c0d8dc9acbdd01b459659b5a266e8c19545781ff2e608579a2318af,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,38e04b12e197b7d6881dba870693c3737f3a0e23145b47225f29be90c9e948ed,Tests_passed,70c5e33a3d73b67069b37165f432373847077940368cc6f54a2ddaf75e480b48,Tests_passed,7a210c6b3182c505d7bc2e11194b38ca5b500ec924df2ce82ba344ed3817d60c,Tests_failed,433be0637d9bab676135af0fc62d6fab16dd065bc4ffa1a6c5f0a5768022e985,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,d7575bb927785bcca54901893d1bcef084b0c38644ba5efb2ddfadec503690a2,Merge_failed,0e3bcbb91d39fa12442cd8690285a077fa583b5afd88e6a38868872da0fa770a,0.057038307189941406,0.061199188232421875,0.05856466293334961,0.02617788314819336,0.055234670639038086,0.05297589302062988,0.06425642967224121,0.4574577808380127,0.4263279438018799,4.292613983154297,0.9370927810668945,0.09970688819885254,0.12987518310546875,0.09242439270019531,0.12997126579284668,0.13328051567077637,0.13247394561767578,0.13640880584716797,0.13265490531921387,0.13645195960998535,0.13297653198242188,0.13387846946716309,0.13136005401611328,0.24799370765686035,0.3515915870666504,5.022399663925171,1.2269988059997559,0.13103890419006348,0.1317586898803711,0.13217830657958984,0.13595318794250488,0.12764906883239746 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 0b3b769513..17ab99a447 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,True,12,21,370,2,True,12,Tests_passed,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,True,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,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,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,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,82b4d9dad0ec346016951a44b415e3b88431b725fcca4df379f843979d3df7a2,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,0.04877042770385742,0.05369281768798828,0.056404829025268555,0.02966904640197754,0.06088900566101074,0.04734516143798828,0.051497459411621094,0.1793515682220459,0.11716341972351074,2.0340962409973145,0.5926804542541504,0.0509493350982666,0.0713498592376709,0.04973459243774414,0.08554553985595703,0.07080578804016113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,True,12,21,370,2,True,12,Tests_passed,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,True,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,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,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,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,82b4d9dad0ec346016951a44b415e3b88431b725fcca4df379f843979d3df7a2,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,0.04877042770385742,0.05369281768798828,0.056404829025268555,0.02966904640197754,0.06088900566101074,0.04734516143798828,0.051497459411621094,0.1793515682220459,0.11716341972351074,2.0340962409973145,0.5926804542541504,0.0509493350982666,0.0713498592376709,0.04973459243774414,0.08554553985595703,0.07080578804016113,0.07122683525085449,0.08432912826538086,0.0915825366973877,0.07267212867736816,0.07167387008666992,0.09179830551147461,0.09304594993591309,0.13303780555725098,0.10452914237976074,2.1914618015289307,0.6933150291442871,0.0847158432006836,0.0901191234588623,0.07309317588806152,0.07343220710754395,0.08669066429138184 diff --git a/results/combined/merges_timed/flaptor/indextank-java.csv b/results/combined/merges_timed/flaptor/indextank-java.csv index 036726e912..b73e782b93 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,True,True,Tests_passed,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,True,7,28,128,3,True,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,True,7,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_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,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_failed,1eaf104de87b92101da8ce51ee180ecb606de2429644afd0727a92d1ee0eb8bc,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,0.010250568389892578,0.01089024543762207,0.011067867279052734,0.017971515655517578,0.011332273483276367,0.011399984359741211,0.010960578918457031,0.049878835678100586,0.12013792991638184,2.3593969345092773,0.5538647174835205,0.03377890586853027,0.07975244522094727,0.03127932548522949,0.0819096565246582,0.07874107360839844 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,True,True,Tests_passed,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,True,7,28,128,3,True,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,True,7,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_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,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_failed,1eaf104de87b92101da8ce51ee180ecb606de2429644afd0727a92d1ee0eb8bc,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,0.010250568389892578,0.01089024543762207,0.011067867279052734,0.017971515655517578,0.011332273483276367,0.011399984359741211,0.010960578918457031,0.049878835678100586,0.12013792991638184,2.3593969345092773,0.5538647174835205,0.03377890586853027,0.07975244522094727,0.03127932548522949,0.0819096565246582,0.07874107360839844,0.07721209526062012,0.07871890068054199,0.07717728614807129,0.07780838012695312,0.07502603530883789,0.07713890075683594,0.07897710800170898,0.1272261142730713,0.13147687911987305,2.208770275115967,0.5927615165710449,0.07688331604003906,0.07704472541809082,0.07691574096679688,0.07667803764343262,0.0799403190612793 diff --git a/results/combined/merges_timed/flaxsearch/luwak.csv b/results/combined/merges_timed/flaxsearch/luwak.csv index b094947c98..b3881ee3e6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -39,refs/heads/master,e546d26294eb9218d5e78c16023f8260817c4354,e662f80a31e44120ec627a025c2ec0c61102d3dd,8e75374da7ac1ee4ec9d31ab411a734c57c7a76a,,True,True,True,3,20,111.0,2,True,3,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,True,Tests_passed,a665e84c59c5fbf5d69a3b14b0132dad242a55605f62dec93f0fd8a4bd987e8f,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,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_failed,2b1191c5cb5409ba23f7596a2265769d6bb14ca8937aa05905910b67eff5661b,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,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,fc5542a2a1d1cc84284d991ab20eb8d2d4188566cbe112af42a3316b1eade549,Tests_failed,2b1191c5cb5409ba23f7596a2265769d6bb14ca8937aa05905910b67eff5661b,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,0.05418062210083008,0.05561327934265137,0.058199167251586914,0.019194602966308594,0.05897259712219238,0.058873653411865234,0.056307077407836914,0.18501615524291992,0.12123322486877441,0.8357665538787842,0.5041313171386719,0.03814244270324707,0.06258392333984375,0.03799557685852051,0.060921669006347656,0.062474727630615234 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +39,refs/heads/master,e546d26294eb9218d5e78c16023f8260817c4354,e662f80a31e44120ec627a025c2ec0c61102d3dd,8e75374da7ac1ee4ec9d31ab411a734c57c7a76a,,True,True,True,3,20,111.0,2,True,3,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,True,Tests_passed,a665e84c59c5fbf5d69a3b14b0132dad242a55605f62dec93f0fd8a4bd987e8f,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,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_failed,2b1191c5cb5409ba23f7596a2265769d6bb14ca8937aa05905910b67eff5661b,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,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,fc5542a2a1d1cc84284d991ab20eb8d2d4188566cbe112af42a3316b1eade549,Tests_failed,2b1191c5cb5409ba23f7596a2265769d6bb14ca8937aa05905910b67eff5661b,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,0.05418062210083008,0.05561327934265137,0.058199167251586914,0.019194602966308594,0.05897259712219238,0.058873653411865234,0.056307077407836914,0.18501615524291992,0.12123322486877441,0.8357665538787842,0.5041313171386719,0.03814244270324707,0.06258392333984375,0.03799557685852051,0.060921669006347656,0.062474727630615234,0.0625758171081543,0.06345438957214355,0.06539511680603027,0.06484103202819824,0.06331181526184082,0.06441259384155273,0.0655064582824707,0.10134291648864746,0.09547305107116699,0.9751715660095215,0.5728592872619629,0.06271696090698242,0.06321883201599121,0.06374740600585938,0.0628957748413086,0.06282281875610352 diff --git a/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv b/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv index bdcac339bf..81e6b58d88 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,True,9,40,141,2,True,9,Tests_passed,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,True,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,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,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,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,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,7f8bf7f38309edc91822a0d6aa3c338af78cfbeb8f28d54283799971dc9bfcbc,Tests_failed,0d8750e10e2546595a10e9c5979fb9bef55cb44b1773cc91138db6055cea497d,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,0.0439152717590332,0.045224905014038086,0.04270029067993164,0.015737295150756836,0.05086159706115723,0.03948616981506348,0.04899024963378906,0.17835140228271484,0.1178288459777832,0.900381326675415,0.47690415382385254,0.03308296203613281,0.05603933334350586,0.03406786918640137,0.057964324951171875,0.056603431701660156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,True,9,40,141,2,True,9,Tests_passed,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,True,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,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,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,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,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,7f8bf7f38309edc91822a0d6aa3c338af78cfbeb8f28d54283799971dc9bfcbc,Tests_failed,0d8750e10e2546595a10e9c5979fb9bef55cb44b1773cc91138db6055cea497d,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,0.0439152717590332,0.045224905014038086,0.04270029067993164,0.015737295150756836,0.05086159706115723,0.03948616981506348,0.04899024963378906,0.17835140228271484,0.1178288459777832,0.900381326675415,0.47690415382385254,0.03308296203613281,0.05603933334350586,0.03406786918640137,0.057964324951171875,0.056603431701660156,0.05762982368469238,0.05727529525756836,0.058931827545166016,0.0594327449798584,0.058547258377075195,0.05831098556518555,0.05872941017150879,0.0938565731048584,0.09006881713867188,0.98724365234375,0.530592679977417,0.05811285972595215,0.05625200271606445,0.05780482292175293,0.05642366409301758,0.058728694915771484 diff --git a/results/combined/merges_timed/fluentlenium/fluentlenium.csv b/results/combined/merges_timed/fluentlenium/fluentlenium.csv index 1ea9700d8a..22914da458 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -387,refs/heads/develop,b281c70c5e8cacf65e8c1ed6c6b05f92c52c433a,9aef806a9dff96134457c7b41a73b0492a1feab2,2907aac3efbe0e4824819671ad9f78e055be0fe8,,True,True,True,9,65,147,2,True,9,Tests_passed,b1d81758717ee68644a31175021c5b7a7066e880f60707f34c423a566adda968,True,Tests_passed,91a8f2fab9e6532f76010c3956b1cedddb0ec1a68fe6d7d6c39cc66ebaf8e73e,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,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_failed,fd537f9a17295ccf4e5c57ff7fa693808363dbf2c8e6d6538a72c484bca92221,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,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,5152f52a934988170b0287145450b16959ca3dff62cc135f50c19d08991ca65c,Tests_failed,fd537f9a17295ccf4e5c57ff7fa693808363dbf2c8e6d6538a72c484bca92221,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,0.04832959175109863,0.04062151908874512,0.044783830642700195,0.02519369125366211,0.04824113845825195,0.03718137741088867,0.03391671180725098,0.17295002937316895,0.1110529899597168,1.1284830570220947,0.4474811553955078,0.03491330146789551,0.0733637809753418,0.03519034385681152,0.07363533973693848,0.06545639038085938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +387,refs/heads/develop,b281c70c5e8cacf65e8c1ed6c6b05f92c52c433a,9aef806a9dff96134457c7b41a73b0492a1feab2,2907aac3efbe0e4824819671ad9f78e055be0fe8,,True,True,True,9,65,147,2,True,9,Tests_passed,b1d81758717ee68644a31175021c5b7a7066e880f60707f34c423a566adda968,True,Tests_passed,91a8f2fab9e6532f76010c3956b1cedddb0ec1a68fe6d7d6c39cc66ebaf8e73e,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,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_failed,fd537f9a17295ccf4e5c57ff7fa693808363dbf2c8e6d6538a72c484bca92221,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,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,5152f52a934988170b0287145450b16959ca3dff62cc135f50c19d08991ca65c,Tests_failed,fd537f9a17295ccf4e5c57ff7fa693808363dbf2c8e6d6538a72c484bca92221,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,0.04832959175109863,0.04062151908874512,0.044783830642700195,0.02519369125366211,0.04824113845825195,0.03718137741088867,0.03391671180725098,0.17295002937316895,0.1110529899597168,1.1284830570220947,0.4474811553955078,0.03491330146789551,0.0733637809753418,0.03519034385681152,0.07363533973693848,0.06545639038085938,0.06042194366455078,0.06656384468078613,0.07110881805419922,0.06351447105407715,0.07256364822387695,0.07019710540771484,0.06261515617370605,0.1107645034790039,0.09058451652526855,1.115485429763794,0.4968273639678955,0.0706777572631836,0.05872821807861328,0.06925702095031738,0.06154060363769531,0.07009267807006836 diff --git a/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv b/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv index ee0ae24a07..a5e10760a0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -154,refs/remotes/origin/openpdf,baf00eff9794d8d582f8368c62765e9b8ceba92f,12c333df32afd0ef607f57efcece59f486123e25,98ad9a169aaf4c090ccea1a3c855897c8a591580,,True,True,Tests_passed,104645c12b2e941cabd58ae9758eb4b57735c3664f5cd65238a30c5470a5cc65,True,482,7496,67285.0,5,True,Tests_passed,1675fcf5f88827ba501eb62468d9b1ca6194eff5f6496bbe662f79013f926fd4,True,482,True,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,a702ecf2907e8bd57e3fb2c3187e3db630a5548d9ff9dd776b90cf4c7ccd8248,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,4b4c04a4b9863faa7ca8128965101e00f59809ce5d9eb7e87600088be4352098,Merge_failed,9bcfbcbb25a37da86410ad8632fc939fba8f4a16893638831afd948f85177416,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,949a92f18d648548d3476ca438e57896fd37daaa1cc72f4e613f695a21701247,Merge_failed,4dafb0767420448b0cd7bbc173cb5d17ec277e85a22ac82f36314131ff1c9bbe,Merge_failed,36b88a73051865ac1d4115d1265c81aeea28e638b01233b446717dbaff0a22cd,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,0.06560444831848145,0.06617379188537598,0.07358336448669434,0.0914297103881836,0.07346510887145996,0.07314848899841309,0.07358098030090332,0.1930859088897705,0.2844998836517334,0.5223782062530518,9.57976222038269,0.150557279586792,0.20089483261108398,0.1480402946472168,0.20840072631835938,0.19662237167358398 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +154,refs/remotes/origin/openpdf,baf00eff9794d8d582f8368c62765e9b8ceba92f,12c333df32afd0ef607f57efcece59f486123e25,98ad9a169aaf4c090ccea1a3c855897c8a591580,,True,True,Tests_passed,104645c12b2e941cabd58ae9758eb4b57735c3664f5cd65238a30c5470a5cc65,True,482,7496,67285.0,5,True,Tests_passed,1675fcf5f88827ba501eb62468d9b1ca6194eff5f6496bbe662f79013f926fd4,True,482,True,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,a702ecf2907e8bd57e3fb2c3187e3db630a5548d9ff9dd776b90cf4c7ccd8248,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,4b4c04a4b9863faa7ca8128965101e00f59809ce5d9eb7e87600088be4352098,Merge_failed,9bcfbcbb25a37da86410ad8632fc939fba8f4a16893638831afd948f85177416,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,949a92f18d648548d3476ca438e57896fd37daaa1cc72f4e613f695a21701247,Merge_failed,4dafb0767420448b0cd7bbc173cb5d17ec277e85a22ac82f36314131ff1c9bbe,Merge_failed,36b88a73051865ac1d4115d1265c81aeea28e638b01233b446717dbaff0a22cd,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,6c853d48d55c6586446936878e48c73b49f1bafd334085850f4545dc88d244bf,Merge_failed,954df77788de6ba5291a76a8823294bff9f24a02fb706a07d016a937a342aaaa,0.06560444831848145,0.06617379188537598,0.07358336448669434,0.0914297103881836,0.07346510887145996,0.07314848899841309,0.07358098030090332,0.1930859088897705,0.2844998836517334,0.5223782062530518,9.57976222038269,0.150557279586792,0.20089483261108398,0.1480402946472168,0.20840072631835938,0.19662237167358398,0.1936960220336914,0.1910557746887207,0.20028185844421387,0.1978764533996582,0.20340585708618164,0.20038795471191406,0.20685386657714844,0.3224320411682129,0.3028881549835205,0.6975352764129639,10.176764488220215,0.20099973678588867,0.20005273818969727,0.1946263313293457,0.19684863090515137,0.18848061561584473 diff --git a/results/combined/merges_timed/fmcarvalho/htmlflow.csv b/results/combined/merges_timed/fmcarvalho/htmlflow.csv index 9c439d0814..a6d127eef1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,True,51,239,3010,11,True,54,Tests_passed,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,True,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,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,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,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,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,fba5b3082af4a9fae3ee1843ccb28642c7a8a5d684d7b5c9cbac18811b67f8c7,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,0.013247013092041016,0.013380765914916992,0.013893842697143555,0.021110057830810547,0.0134124755859375,0.013448953628540039,0.01350092887878418,0.0934901237487793,0.12539267539978027,1.759350061416626,5.827728033065796,0.08599138259887695,0.10834240913391113,0.08708834648132324,0.10731101036071777,0.11069393157958984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,True,51,239,3010,11,True,54,Tests_passed,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,True,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,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,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,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,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,fba5b3082af4a9fae3ee1843ccb28642c7a8a5d684d7b5c9cbac18811b67f8c7,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,0.013247013092041016,0.013380765914916992,0.013893842697143555,0.021110057830810547,0.0134124755859375,0.013448953628540039,0.01350092887878418,0.0934901237487793,0.12539267539978027,1.759350061416626,5.827728033065796,0.08599138259887695,0.10834240913391113,0.08708834648132324,0.10731101036071777,0.11069393157958984,0.10323095321655273,0.10365653038024902,0.10607028007507324,0.10516119003295898,0.10365080833435059,0.10708832740783691,0.10376834869384766,0.21393346786499023,0.1662125587463379,1.9056825637817383,6.2262184619903564,0.10480237007141113,0.10305190086364746,0.10403323173522949,0.1060631275177002,0.10382652282714844 diff --git a/results/combined/merges_timed/fommil/matrix-toolkits-java.csv b/results/combined/merges_timed/fommil/matrix-toolkits-java.csv index b4361f22aa..19c550d824 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,True,17,72,383,4,True,17,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,True,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,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_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,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_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,87c38e2e60e6b66fcad5f846476028773a169bb6955bc2daca92b6820b096431,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,0.0549166202545166,0.04942011833190918,0.05257391929626465,0.01878523826599121,0.0419003963470459,0.03216123580932617,0.04369759559631348,0.3062717914581299,0.2349562644958496,2.7642922401428223,0.6158361434936523,0.03603076934814453,0.10416936874389648,0.05263209342956543,0.1202704906463623,0.10982871055603027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,True,17,72,383,4,True,17,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,True,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,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_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,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_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,87c38e2e60e6b66fcad5f846476028773a169bb6955bc2daca92b6820b096431,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,0.0549166202545166,0.04942011833190918,0.05257391929626465,0.01878523826599121,0.0419003963470459,0.03216123580932617,0.04369759559631348,0.3062717914581299,0.2349562644958496,2.7642922401428223,0.6158361434936523,0.03603076934814453,0.10416936874389648,0.05263209342956543,0.1202704906463623,0.10982871055603027,0.10742354393005371,0.11656737327575684,0.09660172462463379,0.09870314598083496,0.1252129077911377,0.11652708053588867,0.09668898582458496,0.1657705307006836,0.20074868202209473,2.7838640213012695,0.6657876968383789,0.09785580635070801,0.11792349815368652,0.12000703811645508,0.09903335571289062,0.09908008575439453 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 24f576719c..88c137f4b1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,True,9,33,128,2,True,9,Tests_passed,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,True,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,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,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,4d52a7977f5b636495a36507f3f8e7a19413b146db075d6c18c0373146a9149f,Tests_failed,01d3fac2c2a73265f5ab540bd271f7f8be8e4fb41865da46c9544f61e5f42229,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,0.04339098930358887,0.05304718017578125,0.04604005813598633,0.03304171562194824,0.042528390884399414,0.038832664489746094,0.03623080253601074,0.17897248268127441,0.1161355972290039,0.6684248447418213,0.5547130107879639,0.05533552169799805,0.08521294593811035,0.05850052833557129,0.0861513614654541,0.08487129211425781 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,True,9,33,128,2,True,9,Tests_passed,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,True,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,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,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,4d52a7977f5b636495a36507f3f8e7a19413b146db075d6c18c0373146a9149f,Tests_failed,01d3fac2c2a73265f5ab540bd271f7f8be8e4fb41865da46c9544f61e5f42229,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,dff5e503feb2b9f3e1e1a7a3fa022c45810d2b13bc521f6ebd20756a58f1009e,Tests_passed,eec3b255c458ea7696157559b67595a2e041a14ae863f97883ac813cd6d81955,0.04339098930358887,0.05304718017578125,0.04604005813598633,0.03304171562194824,0.042528390884399414,0.038832664489746094,0.03623080253601074,0.17897248268127441,0.1161355972290039,0.6684248447418213,0.5547130107879639,0.05533552169799805,0.08521294593811035,0.05850052833557129,0.0861513614654541,0.08487129211425781,0.08238768577575684,0.08492612838745117,0.0921182632446289,0.0906217098236084,0.0872488021850586,0.09206271171569824,0.09432530403137207,0.13100981712341309,0.12093114852905273,0.7094359397888184,0.6465325355529785,0.0856020450592041,0.0870826244354248,0.08773064613342285,0.08393597602844238,0.08616089820861816 diff --git a/results/combined/merges_timed/forcedotcom/sitecrawler.csv b/results/combined/merges_timed/forcedotcom/sitecrawler.csv index 69c7bd5499..445303a077 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,True,13,79,1175,3,True,13,Tests_passed,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,True,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,True,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,198451b2a698f649956e8b1062a032242016267bd2cb4ff3b67440e370c7e0fd,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,Merge_failed,1d158be59cd23a77adc4c223fb295db79ef69e8563001426f32207c13c4e1f9a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,c75e3d71683d03d00c5998d3ceaec8cb4060a2fd086590bd1d81179624023b18,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,9274a08466997ff16f1c733822989802b772257603a5e6a41bba56518aab531a,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,0.029335498809814453,0.039617300033569336,0.0470273494720459,0.01675724983215332,0.041768550872802734,0.03925061225891113,0.043589115142822266,0.21124482154846191,0.17145514488220215,1.4854199886322021,1.4433419704437256,0.05725741386413574,0.05641937255859375,0.06925129890441895,0.0762948989868164,0.057153940200805664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,True,13,79,1175,3,True,13,Tests_passed,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,True,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,True,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,198451b2a698f649956e8b1062a032242016267bd2cb4ff3b67440e370c7e0fd,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,Merge_failed,1d158be59cd23a77adc4c223fb295db79ef69e8563001426f32207c13c4e1f9a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,c75e3d71683d03d00c5998d3ceaec8cb4060a2fd086590bd1d81179624023b18,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,9274a08466997ff16f1c733822989802b772257603a5e6a41bba56518aab531a,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,c253ce925258186b1f864c54eae5e30c01a9554a7542f04bbd6513ba96d999fc,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,0.029335498809814453,0.039617300033569336,0.0470273494720459,0.01675724983215332,0.041768550872802734,0.03925061225891113,0.043589115142822266,0.21124482154846191,0.17145514488220215,1.4854199886322021,1.4433419704437256,0.05725741386413574,0.05641937255859375,0.06925129890441895,0.0762948989868164,0.057153940200805664,0.07483267784118652,0.057395219802856445,0.07655119895935059,0.061070919036865234,0.13130688667297363,0.13820672035217285,0.132460355758667,0.18312788009643555,0.19509363174438477,1.788914680480957,1.6327483654022217,0.07870316505432129,0.07627511024475098,0.08065438270568848,0.0785527229309082,0.0569155216217041 diff --git a/results/combined/merges_timed/forcedotcom/wsc.csv b/results/combined/merges_timed/forcedotcom/wsc.csv index 8ddad75fec..5e8db000ea 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,True,9.0,21,191.0,2,True,9,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,True,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,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,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,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,5d087a195489781af14c13b23f8718ade863d7ff3b14f9bcea562eb31ca8fa32,Tests_failed,7a10709c7a9deb4cd429bdcdf61b497852b56a919bf891abf8b438a2eac07b0b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,0.05475759506225586,0.03507852554321289,0.021309852600097656,0.019460201263427734,0.021625280380249023,0.048845767974853516,0.04659605026245117,0.17069244384765625,0.12500524520874023,1.5530390739440918,0.5248115062713623,0.052979230880737305,0.06548953056335449,0.0552363395690918,0.06563496589660645,0.0846261978149414 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,True,9.0,21,191.0,2,True,9,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,True,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,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,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,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,5d087a195489781af14c13b23f8718ade863d7ff3b14f9bcea562eb31ca8fa32,Tests_failed,7a10709c7a9deb4cd429bdcdf61b497852b56a919bf891abf8b438a2eac07b0b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,0.05475759506225586,0.03507852554321289,0.021309852600097656,0.019460201263427734,0.021625280380249023,0.048845767974853516,0.04659605026245117,0.17069244384765625,0.12500524520874023,1.5530390739440918,0.5248115062713623,0.052979230880737305,0.06548953056335449,0.0552363395690918,0.06563496589660645,0.0846261978149414,0.07557487487792969,0.06252169609069824,0.0822758674621582,0.07972335815429688,0.0842127799987793,0.08435893058776855,0.060545921325683594,0.12085103988647461,0.11418604850769043,1.5346460342407227,0.5429191589355469,0.07742619514465332,0.0789186954498291,0.0644385814666748,0.07906675338745117,0.06180715560913086 diff --git a/results/combined/merges_timed/fordfrog/apgdiff.csv b/results/combined/merges_timed/fordfrog/apgdiff.csv index 677d5d57b1..cadcd9c3af 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,True,True,Tests_passed,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,True,50,103,1852,4,True,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,True,50,True,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,22243ee00dca01dda8337b1f988cc40435d63a4c06cc5ad9a49ab82037b8dc37,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,dbb19f82113350394bd572e871fd9c3d1444669ff495275bc81e22835583e819,Merge_failed,3f84f509f4e805a632fed234c3d6cc7eede3c9664d576f7fade105f4ca608c01,Merge_failed,ce8c38167102a2d36499d6caa0761ffd0557fdd25da096b921e814b0a9e18112,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,0.04885697364807129,0.059472084045410156,0.049497127532958984,0.021869421005249023,0.05723285675048828,0.05181097984313965,0.05413675308227539,0.29584741592407227,0.24335217475891113,1.534956455230713,0.7804124355316162,0.07119464874267578,0.0732276439666748,0.07744598388671875,0.08514547348022461,0.08638596534729004 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,True,True,Tests_passed,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,True,50,103,1852,4,True,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,True,50,True,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,22243ee00dca01dda8337b1f988cc40435d63a4c06cc5ad9a49ab82037b8dc37,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,dbb19f82113350394bd572e871fd9c3d1444669ff495275bc81e22835583e819,Merge_failed,3f84f509f4e805a632fed234c3d6cc7eede3c9664d576f7fade105f4ca608c01,Merge_failed,ce8c38167102a2d36499d6caa0761ffd0557fdd25da096b921e814b0a9e18112,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,a95f4a91651e3b9d883b6b19ff0b0d7b7ea2d4286f73c61f2e0f400d378759c4,Merge_failed,9cd50047068dfe3916a5e7a209b833480cb5c219476d58cbd5696400315e85c1,0.04885697364807129,0.059472084045410156,0.049497127532958984,0.021869421005249023,0.05723285675048828,0.05181097984313965,0.05413675308227539,0.29584741592407227,0.24335217475891113,1.534956455230713,0.7804124355316162,0.07119464874267578,0.0732276439666748,0.07744598388671875,0.08514547348022461,0.08638596534729004,0.08175849914550781,0.08233404159545898,0.0815732479095459,0.0803678035736084,0.08072948455810547,0.08000659942626953,0.07989978790283203,0.14143824577331543,0.18050622940063477,1.6077942848205566,0.8761560916900635,0.08139443397521973,0.08254432678222656,0.08002853393554688,0.08278942108154297,0.08033323287963867 diff --git a/results/combined/merges_timed/frankbille/scoreboard.csv b/results/combined/merges_timed/frankbille/scoreboard.csv index 237909f76b..0a5a42c9af 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,True,True,Tests_passed,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,True,21,58,530,4,True,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,True,21,True,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,15701243fe47888c0094f83d53076858acbebeca79a8cb9a85563822452ba52a,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,ca08437da33c7e9fba0be2a0a2b98d57fa793018263be1fc17c0415891645094,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,feb79a6d64717768fdfa18a782668c7a1cf07ebd4ed53ca84357f2b19b3031d3,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,0.04317736625671387,0.0421910285949707,0.04440712928771973,0.01735973358154297,0.036414146423339844,0.04386019706726074,0.04506707191467285,0.2819328308105469,0.22227191925048828,0.6773483753204346,0.4195840358734131,0.05553722381591797,0.07642555236816406,0.05378866195678711,0.07567834854125977,0.07542610168457031 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,True,True,Tests_passed,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,True,21,58,530,4,True,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,True,21,True,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,15701243fe47888c0094f83d53076858acbebeca79a8cb9a85563822452ba52a,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,ca08437da33c7e9fba0be2a0a2b98d57fa793018263be1fc17c0415891645094,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,feb79a6d64717768fdfa18a782668c7a1cf07ebd4ed53ca84357f2b19b3031d3,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,0.04317736625671387,0.0421910285949707,0.04440712928771973,0.01735973358154297,0.036414146423339844,0.04386019706726074,0.04506707191467285,0.2819328308105469,0.22227191925048828,0.6773483753204346,0.4195840358734131,0.05553722381591797,0.07642555236816406,0.05378866195678711,0.07567834854125977,0.07542610168457031,0.0733499526977539,0.0735330581665039,0.07350707054138184,0.07467365264892578,0.07517313957214355,0.07393002510070801,0.07961106300354004,0.1380622386932373,0.1576988697052002,0.7283883094787598,0.4970703125,0.07271695137023926,0.07065820693969727,0.07148313522338867,0.07317996025085449,0.0737142562866211 diff --git a/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv b/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv index f10181f0f1..58df7a42bc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,False,True,4,15,97.0,2,True,4,Tests_passed,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,True,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,True,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,5119dd46dbff4b4503af306a540d71c19aeabbb4484ffbe43c8a7d2f68d035b9,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,37b1e01d0ae18f610ee941b5efa58b601f1bb2870fa46ec61faa992800a46e7c,Merge_failed,b45082971e216247d51edc7f344c4433b755e56e60fce1ba12475c8cae8021d2,Merge_failed,293c3cc5d350b83bf6a792532c951a82e3103bb54be83529de402dc52f6f2aae,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Tests_failed,722bcb3486d1d758e314de84f6f15c8a09c4d9992c621bb0a75cb2bc7f8d9fb4,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,0.014382600784301758,0.013904571533203125,0.01417231559753418,0.017870426177978516,0.017899513244628906,0.014735698699951172,0.014295816421508789,0.052956342697143555,0.0749657154083252,1.670215129852295,0.5028331279754639,0.047286272048950195,0.04789924621582031,0.047724246978759766,0.05025434494018555,0.051740407943725586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,False,True,4,15,97.0,2,True,4,Tests_passed,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,True,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,True,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,5119dd46dbff4b4503af306a540d71c19aeabbb4484ffbe43c8a7d2f68d035b9,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,37b1e01d0ae18f610ee941b5efa58b601f1bb2870fa46ec61faa992800a46e7c,Merge_failed,b45082971e216247d51edc7f344c4433b755e56e60fce1ba12475c8cae8021d2,Merge_failed,293c3cc5d350b83bf6a792532c951a82e3103bb54be83529de402dc52f6f2aae,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Tests_failed,722bcb3486d1d758e314de84f6f15c8a09c4d9992c621bb0a75cb2bc7f8d9fb4,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,Merge_failed,4e7de945f826dc506f9153e5e88c3ab4a8b058d372da15a9bf56f0c2f334b02d,0.014382600784301758,0.013904571533203125,0.01417231559753418,0.017870426177978516,0.017899513244628906,0.014735698699951172,0.014295816421508789,0.052956342697143555,0.0749657154083252,1.670215129852295,0.5028331279754639,0.047286272048950195,0.04789924621582031,0.047724246978759766,0.05025434494018555,0.051740407943725586,0.04840207099914551,0.047531843185424805,0.050792694091796875,0.04840373992919922,0.049577951431274414,0.049483537673950195,0.04882073402404785,0.08163905143737793,0.08403515815734863,1.571537971496582,0.5586287975311279,0.047609567642211914,0.05008983612060547,0.04983878135681152,0.05036211013793945,0.0492396354675293 diff --git a/results/combined/merges_timed/frizbog/gedcom4j.csv b/results/combined/merges_timed/frizbog/gedcom4j.csv index e2d3c95b86..1f44d2a094 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,True,293,2906,38766,6,True,296,Tests_passed,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,True,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,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,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Tests_failed,22efdfa9c05eaeb1fb34d77cd8ec69021b7ff4e09ec1fcd7e98f33a6db0c3225,Merge_failed,18df987a8b63c22d24a5c2261d2ab29d103667109ce4996d2f4f542d83f5ccb6,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,053711583b933f1a2b2cc84df92fb21f01a28025f8f88ebb4b2b5072f9177c8a,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,a8e27f6532ce3c3c4bd6dc3a3a242bc1e1704073d0faaef9c37066bf8bc3cca5,Tests_failed,ae333552f4e7107d00862483e7f9b22ba67f6b040349d088e7f3955dcf6d277a,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,0.054558515548706055,0.05584383010864258,0.06137871742248535,0.049742698669433594,0.055321693420410156,0.040500640869140625,0.08191394805908203,0.21737909317016602,0.17885041236877441,4.072464466094971,21.103285789489746,0.1029825210571289,0.14228129386901855,0.09991621971130371,0.1608273983001709,0.09926629066467285 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,True,293,2906,38766,6,True,296,Tests_passed,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,True,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,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,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Tests_failed,22efdfa9c05eaeb1fb34d77cd8ec69021b7ff4e09ec1fcd7e98f33a6db0c3225,Merge_failed,18df987a8b63c22d24a5c2261d2ab29d103667109ce4996d2f4f542d83f5ccb6,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,053711583b933f1a2b2cc84df92fb21f01a28025f8f88ebb4b2b5072f9177c8a,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,a8e27f6532ce3c3c4bd6dc3a3a242bc1e1704073d0faaef9c37066bf8bc3cca5,Tests_failed,ae333552f4e7107d00862483e7f9b22ba67f6b040349d088e7f3955dcf6d277a,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,0.054558515548706055,0.05584383010864258,0.06137871742248535,0.049742698669433594,0.055321693420410156,0.040500640869140625,0.08191394805908203,0.21737909317016602,0.17885041236877441,4.072464466094971,21.103285789489746,0.1029825210571289,0.14228129386901855,0.09991621971130371,0.1608273983001709,0.09926629066467285,0.10663604736328125,0.09499263763427734,0.1059563159942627,0.24897408485412598,0.0948784351348877,0.24593424797058105,0.1540071964263916,0.299236536026001,0.32372474670410156,4.1728832721710205,22.26348304748535,0.10495972633361816,0.10338163375854492,0.15879225730895996,0.10312247276306152,0.09381365776062012 diff --git a/results/combined/merges_timed/fusesource/hawtjni.csv b/results/combined/merges_timed/fusesource/hawtjni.csv index 5343f6540b..a3a5b4417d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,True,True,True,15,70,1139,2,True,15,Tests_passed,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,True,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,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,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,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,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,20df85b4214d2d0e017c58b80dcb77da2cb4aa1ca093becdedd5a83fc718d3fd,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,0.021950483322143555,0.02215123176574707,0.028789758682250977,0.037213802337646484,0.028893709182739258,0.02866816520690918,0.02871870994567871,0.06073617935180664,0.07700347900390625,1.0102307796478271,0.39148736000061035,0.06830859184265137,0.09030461311340332,0.066864013671875,0.09372758865356445,0.09488964080810547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,True,True,True,15,70,1139,2,True,15,Tests_passed,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,True,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,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,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,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,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,20df85b4214d2d0e017c58b80dcb77da2cb4aa1ca093becdedd5a83fc718d3fd,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,0.021950483322143555,0.02215123176574707,0.028789758682250977,0.037213802337646484,0.028893709182739258,0.02866816520690918,0.02871870994567871,0.06073617935180664,0.07700347900390625,1.0102307796478271,0.39148736000061035,0.06830859184265137,0.09030461311340332,0.066864013671875,0.09372758865356445,0.09488964080810547,0.09129023551940918,0.09078168869018555,0.05716061592102051,0.09834051132202148,0.10110116004943848,0.09991788864135742,0.09728312492370605,0.09089016914367676,0.13180041313171387,1.091235637664795,0.4201688766479492,0.09187173843383789,0.05775880813598633,0.08912372589111328,0.09093689918518066,0.08813619613647461 diff --git a/results/combined/merges_timed/fusesource/jansi-native.csv b/results/combined/merges_timed/fusesource/jansi-native.csv index f5f63a37c7..e7bb35d54d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,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,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Tests_passed,b53fbabbb270780e98d1b70badc6e4b836da0af7cf079ec89be0bbf90e992414,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,8cac78a996c33e81722bdb328eed20d3d3a6209463f4dff263a9a80a61a6f62c,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,e6dccb921f9af2409c0d9049917faa9fc84fc21013e9ec5664b99c18bbf95aa6,Tests_failed,3b9a6c4724d45beb3eb35eb1ab684e9831eb38512ddc8c922b3b7f5988647877,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,0.00982046127319336,0.01029658317565918,0.00962066650390625,0.018096446990966797,0.009675025939941406,0.009786605834960938,0.009704351425170898,0.034417152404785156,0.06694722175598145,0.6613233089447021,0.5117793083190918,0.0527806282043457,0.04486894607543945,0.04290056228637695,0.04528236389160156,0.0629267692565918 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,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,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Tests_passed,b53fbabbb270780e98d1b70badc6e4b836da0af7cf079ec89be0bbf90e992414,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,8cac78a996c33e81722bdb328eed20d3d3a6209463f4dff263a9a80a61a6f62c,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,e6dccb921f9af2409c0d9049917faa9fc84fc21013e9ec5664b99c18bbf95aa6,Tests_failed,3b9a6c4724d45beb3eb35eb1ab684e9831eb38512ddc8c922b3b7f5988647877,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,fe04454d90b744fbc91515490eb3e710853cb2d87569750d567db19f553ca681,0.00982046127319336,0.01029658317565918,0.00962066650390625,0.018096446990966797,0.009675025939941406,0.009786605834960938,0.009704351425170898,0.034417152404785156,0.06694722175598145,0.6613233089447021,0.5117793083190918,0.0527806282043457,0.04486894607543945,0.04290056228637695,0.04528236389160156,0.0629267692565918,0.04424166679382324,0.0575864315032959,0.04248452186584473,0.06090378761291504,0.04471564292907715,0.04302072525024414,0.04514360427856445,0.07622218132019043,0.07727718353271484,0.7577359676361084,0.589512825012207,0.043959856033325195,0.04350686073303223,0.04249429702758789,0.043468475341796875,0.05947232246398926 diff --git a/results/combined/merges_timed/fusesource/jansi.csv b/results/combined/merges_timed/fusesource/jansi.csv index 9d64b919e6..759df1a44f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,True,9,24,127,2,True,9,Tests_passed,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,True,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,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,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,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,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,d1aeb1fa09ff50166c451eae0b5fd2311639c4c0abb456e1edea9985a6adfeba,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,0.04625892639160156,0.050188302993774414,0.04698324203491211,0.0200040340423584,0.04465293884277344,0.040238142013549805,0.04700493812561035,0.15979838371276855,0.10337424278259277,0.6057331562042236,0.3527083396911621,0.0394132137298584,0.06305193901062012,0.03884744644165039,0.060738563537597656,0.06278395652770996 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,True,9,24,127,2,True,9,Tests_passed,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,True,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,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,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,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,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,d1aeb1fa09ff50166c451eae0b5fd2311639c4c0abb456e1edea9985a6adfeba,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,0.04625892639160156,0.050188302993774414,0.04698324203491211,0.0200040340423584,0.04465293884277344,0.040238142013549805,0.04700493812561035,0.15979838371276855,0.10337424278259277,0.6057331562042236,0.3527083396911621,0.0394132137298584,0.06305193901062012,0.03884744644165039,0.060738563537597656,0.06278395652770996,0.06156206130981445,0.061573028564453125,0.06274104118347168,0.06348609924316406,0.06213498115539551,0.061079978942871094,0.06282639503479004,0.09714603424072266,0.09285163879394531,0.6304192543029785,0.39673662185668945,0.06093192100524902,0.06138753890991211,0.06040358543395996,0.05927252769470215,0.06007242202758789 diff --git a/results/combined/merges_timed/galenframework/galen.csv b/results/combined/merges_timed/galenframework/galen.csv index 6b5de2359a..792abce2e5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,True,True,True,527,1096,33791,3,True,527,Tests_passed,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,True,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,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,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,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,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,2b178e2cc52dc24c024fc37fae06b2e2a602444b370952d27a342baa5193827f,Tests_failed,b13441efebb3abab0e1fba291f83b9e9cdce7636630adacbb246481e8dcd2f8a,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,0.04467058181762695,0.04390144348144531,0.06894707679748535,0.0629568099975586,0.06309199333190918,0.06583046913146973,0.062491655349731445,0.2464447021484375,0.16417503356933594,1.2046692371368408,6.271050214767456,0.09268879890441895,0.155198335647583,0.09477400779724121,0.1448056697845459,0.1582648754119873 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,True,True,True,527,1096,33791,3,True,527,Tests_passed,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,True,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,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,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,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,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,2b178e2cc52dc24c024fc37fae06b2e2a602444b370952d27a342baa5193827f,Tests_failed,b13441efebb3abab0e1fba291f83b9e9cdce7636630adacbb246481e8dcd2f8a,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,0.04467058181762695,0.04390144348144531,0.06894707679748535,0.0629568099975586,0.06309199333190918,0.06583046913146973,0.062491655349731445,0.2464447021484375,0.16417503356933594,1.2046692371368408,6.271050214767456,0.09268879890441895,0.155198335647583,0.09477400779724121,0.1448056697845459,0.1582648754119873,0.15178346633911133,0.1522667407989502,0.16623950004577637,0.1693723201751709,0.1715078353881836,0.17103123664855957,0.16974592208862305,0.24182939529418945,0.22446656227111816,1.4909682273864746,5.753169059753418,0.15371990203857422,0.15136957168579102,0.15278291702270508,0.1542363166809082,0.15008282661437988 diff --git a/results/combined/merges_timed/garbagemule/mobarena.csv b/results/combined/merges_timed/garbagemule/mobarena.csv index 70be8fd01c..bb874b4b05 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,True,True,Tests_passed,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,True,6,16,48.0,2,True,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,True,6,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,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,Tests_passed,e42ca4b6bc0f6b0984660d6ef4ee14292ec67a2aa2b6a4ca5a658d9d28bf6442,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,c782b6ee94dcb268217d14cb3c9ae1979488ddd46cf651bd0303f00d76ad31c2,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Tests_failed,920b980c306d2f0d215c9bf4fa8be91d98b8226b04088edba32c2f521d5aefd4,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,0.047921180725097656,0.04127955436706543,0.04158496856689453,0.029386520385742188,0.04485177993774414,0.04928755760192871,0.04156041145324707,0.16989493370056152,0.11901330947875977,0.9228169918060303,0.5442514419555664,0.0773007869720459,0.05718183517456055,0.04155874252319336,0.04445910453796387,0.045324087142944336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,True,True,Tests_passed,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,True,6,16,48.0,2,True,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,True,6,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,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,Tests_passed,e42ca4b6bc0f6b0984660d6ef4ee14292ec67a2aa2b6a4ca5a658d9d28bf6442,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,c782b6ee94dcb268217d14cb3c9ae1979488ddd46cf651bd0303f00d76ad31c2,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Tests_failed,920b980c306d2f0d215c9bf4fa8be91d98b8226b04088edba32c2f521d5aefd4,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,0.047921180725097656,0.04127955436706543,0.04158496856689453,0.029386520385742188,0.04485177993774414,0.04928755760192871,0.04156041145324707,0.16989493370056152,0.11901330947875977,0.9228169918060303,0.5442514419555664,0.0773007869720459,0.05718183517456055,0.04155874252319336,0.04445910453796387,0.045324087142944336,0.04289650917053223,0.04293107986450195,0.057648658752441406,0.05840635299682617,0.055459022521972656,0.04319310188293457,0.04280400276184082,0.07421040534973145,0.08141255378723145,0.932408332824707,0.6057991981506348,0.05338883399963379,0.053672075271606445,0.05555987358093262,0.04290485382080078,0.04230952262878418 diff --git a/results/combined/merges_timed/gatein/gatein-api-java.csv b/results/combined/merges_timed/gatein/gatein-api-java.csv index dec10a2dc1..7e88b77cfc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,True,True,Tests_passed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,True,60,114,7232,8,True,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,True,63,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,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,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,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,0.046964168548583984,0.05846238136291504,0.06241106986999512,0.020589351654052734,0.05231428146362305,0.05549001693725586,0.049141883850097656,0.32676076889038086,0.2130107879638672,0.9639706611633301,1.190206527709961,0.05100226402282715,0.048629045486450195,0.05004262924194336,0.04864978790283203,0.04731249809265137 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,True,True,Tests_passed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,True,60,114,7232,8,True,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,True,63,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,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,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,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,0.046964168548583984,0.05846238136291504,0.06241106986999512,0.020589351654052734,0.05231428146362305,0.05549001693725586,0.049141883850097656,0.32676076889038086,0.2130107879638672,0.9639706611633301,1.190206527709961,0.05100226402282715,0.048629045486450195,0.05004262924194336,0.04864978790283203,0.04731249809265137,0.046627044677734375,0.046674489974975586,0.04755854606628418,0.04664921760559082,0.04674077033996582,0.04693174362182617,0.04800152778625488,0.11695241928100586,0.1229257583618164,0.977959156036377,1.3256981372833252,0.04594993591308594,0.045368194580078125,0.04798269271850586,0.045841217041015625,0.0464015007019043 diff --git a/results/combined/merges_timed/gbif/name-parser.csv b/results/combined/merges_timed/gbif/name-parser.csv index 5bb75d1128..0a8345b353 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,True,19,58,2802,3,True,19,Tests_passed,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,True,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,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_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_failed,faa30b37c3b2d8b9e760d18b7aa361835eb6b2d107e0e963cda772a4acc145e2,Tests_failed,6a7e771185235c12f1d80cb95d4870f872a0890bca831d40f838da339096286c,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,0.021604299545288086,0.023651838302612305,0.026897668838500977,0.03687739372253418,0.026285648345947266,0.026378154754638672,0.02587294578552246,0.07102751731872559,0.13080310821533203,3.0228819847106934,1.123028039932251,0.05828523635864258,0.12827563285827637,0.06659173965454102,0.12703871726989746,0.12933087348937988 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,True,19,58,2802,3,True,19,Tests_passed,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,True,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,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_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_failed,faa30b37c3b2d8b9e760d18b7aa361835eb6b2d107e0e963cda772a4acc145e2,Tests_failed,6a7e771185235c12f1d80cb95d4870f872a0890bca831d40f838da339096286c,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,a03c8e7abf920d63bcc63766a39264119c1d0509e1d51a04c268608326032e1e,Tests_passed,97ff7f6ed4fdff0d2cfeaf0a0ce4a7665d7b7640e0f75dc20553dd5cabb1effc,0.021604299545288086,0.023651838302612305,0.026897668838500977,0.03687739372253418,0.026285648345947266,0.026378154754638672,0.02587294578552246,0.07102751731872559,0.13080310821533203,3.0228819847106934,1.123028039932251,0.05828523635864258,0.12827563285827637,0.06659173965454102,0.12703871726989746,0.12933087348937988,0.1277153491973877,0.13162875175476074,0.13959884643554688,0.1346876621246338,0.134674072265625,0.1367177963256836,0.13677597045898438,0.19759583473205566,0.18490290641784668,3.654407501220703,1.2166686058044434,0.125382661819458,0.1341109275817871,0.1283891201019287,0.13025832176208496,0.13328981399536133 diff --git a/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv b/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv index 821b96d4e5..8c33e61c00 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,Tests_passed,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,True,16,52,863,16,True,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,True,27,True,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,bcd0042e77d9366f9b487ed4dfeffca59eb795f2168c464ee9c82f6d422e3f13,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,Merge_failed,93877a1374a96223a3f0d3aaaec70cd622ea78ddd72804f03b33b0bd105f9f0d,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,f73aca992c7019774e045300c58fb54e572796e820d3fead2ce80eb5612b2a61,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,ea203a0e2d2ea5f7defa7bee62ef28347fa1defa5270f973a72c00b2ad801d40,Merge_failed,bba91c84fccecbc894e23cbe24bf0e33cda9d26d84c85a2ad9143406113383df,Merge_failed,d2330f5eed03018c25241dd73334275bc29af89f2d9bb1649de9c2471759effa,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,0.04081249237060547,0.0453946590423584,0.04455375671386719,0.014444828033447266,0.04331660270690918,0.0393366813659668,0.04028797149658203,0.35571956634521484,0.29741930961608887,1.413137674331665,0.4519481658935547,0.07636213302612305,0.08423852920532227,0.0833892822265625,0.09303116798400879,0.0916450023651123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,Tests_passed,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,True,16,52,863,16,True,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,True,27,True,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,bcd0042e77d9366f9b487ed4dfeffca59eb795f2168c464ee9c82f6d422e3f13,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,Merge_failed,93877a1374a96223a3f0d3aaaec70cd622ea78ddd72804f03b33b0bd105f9f0d,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,f73aca992c7019774e045300c58fb54e572796e820d3fead2ce80eb5612b2a61,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,ea203a0e2d2ea5f7defa7bee62ef28347fa1defa5270f973a72c00b2ad801d40,Merge_failed,bba91c84fccecbc894e23cbe24bf0e33cda9d26d84c85a2ad9143406113383df,Merge_failed,d2330f5eed03018c25241dd73334275bc29af89f2d9bb1649de9c2471759effa,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,6852ab74849e23554db9a199614e1b72de3c2338e0ba692a929799c5bee0705e,Merge_failed,309cc55d0f642c92ab61f4904899852c9ae2068f56d5562bec5a7cc3f7a1042b,0.04081249237060547,0.0453946590423584,0.04455375671386719,0.014444828033447266,0.04331660270690918,0.0393366813659668,0.04028797149658203,0.35571956634521484,0.29741930961608887,1.413137674331665,0.4519481658935547,0.07636213302612305,0.08423852920532227,0.0833892822265625,0.09303116798400879,0.0916450023651123,0.08835244178771973,0.08497786521911621,0.08735466003417969,0.08604836463928223,0.08699321746826172,0.08743119239807129,0.0919334888458252,0.16348648071289062,0.2045145034790039,1.4930803775787354,0.5379807949066162,0.08921074867248535,0.08947253227233887,0.08835482597351074,0.09001016616821289,0.08646726608276367 diff --git a/results/combined/merges_timed/geoffreywiseman/moo.csv b/results/combined/merges_timed/geoffreywiseman/moo.csv index 2850f3720b..8cf16a0ac3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,True,18,90,428,3,True,18,Tests_passed,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,True,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,True,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,d154e8dfdce5acfd29d0157810b80d5b2235717f6695a391e123e4a92207c0c5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,713346e44435ce8effc1f6bb660154009476aae7f06a14f457b419573fce9aec,Merge_failed,5558ef6d192da02c0488b566d6c9bfdf2ad2269e1430d5697ee0caf90d5eb196,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,55fc58a0b369b9ddac28d6b1516f816a7713b5a3fcfd5a7dd24bdcbf8a318c6c,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,0.022982358932495117,0.04178667068481445,0.03760051727294922,0.015320539474487305,0.04782748222351074,0.044286489486694336,0.04223132133483887,0.21901392936706543,0.19098854064941406,0.7496030330657959,0.5148992538452148,0.052698373794555664,0.06341218948364258,0.057032108306884766,0.07494115829467773,0.07524681091308594 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,True,18,90,428,3,True,18,Tests_passed,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,True,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,True,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,d154e8dfdce5acfd29d0157810b80d5b2235717f6695a391e123e4a92207c0c5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,713346e44435ce8effc1f6bb660154009476aae7f06a14f457b419573fce9aec,Merge_failed,5558ef6d192da02c0488b566d6c9bfdf2ad2269e1430d5697ee0caf90d5eb196,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,55fc58a0b369b9ddac28d6b1516f816a7713b5a3fcfd5a7dd24bdcbf8a318c6c,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,7522e54e6782cb0f696af3bdf86bfbf1f7079272cfc56d6775b86b94d235beb2,Tests_passed,c36fbb5cc2d6bbd88f1884ccc5a3abb063f07f5869a95cea1b44eb67218547f7,0.022982358932495117,0.04178667068481445,0.03760051727294922,0.015320539474487305,0.04782748222351074,0.044286489486694336,0.04223132133483887,0.21901392936706543,0.19098854064941406,0.7496030330657959,0.5148992538452148,0.052698373794555664,0.06341218948364258,0.057032108306884766,0.07494115829467773,0.07524681091308594,0.07053565979003906,0.07261419296264648,0.07240486145019531,0.07249641418457031,0.0722653865814209,0.07275176048278809,0.07225155830383301,0.11586451530456543,0.1368272304534912,0.7938735485076904,0.5791847705841064,0.0713658332824707,0.07219529151916504,0.07076001167297363,0.071746826171875,0.07207441329956055 diff --git a/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv b/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv index ad2bec775a..3b0d2ef6bf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,True,9,16,437,2,True,9,Tests_passed,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,True,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,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,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,417385f8c5a628a0d53d86065ce46660a1301175f6eec3d79245754af86caf52,Tests_failed,00a946bed01e50f0e4907ee31e78b65d113c53a0b9572663b63a6536e3946964,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,0.02625417709350586,0.026995420455932617,0.03398561477661133,0.017643451690673828,0.034331560134887695,0.034569501876831055,0.034557342529296875,0.06989121437072754,0.08507347106933594,1.1393253803253174,0.3777151107788086,0.07349205017089844,0.06366872787475586,0.06853079795837402,0.10293054580688477,0.08727383613586426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,True,9,16,437,2,True,9,Tests_passed,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,True,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,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,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,417385f8c5a628a0d53d86065ce46660a1301175f6eec3d79245754af86caf52,Tests_failed,00a946bed01e50f0e4907ee31e78b65d113c53a0b9572663b63a6536e3946964,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,3cf5b1548c18864885698777ae2cf29995950dea803f0e72021bb32d175b5643,Tests_passed,f900d9e3877c215be5bb280959c26502d25ac88127f49bdda3c14f82ee925852,0.02625417709350586,0.026995420455932617,0.03398561477661133,0.017643451690673828,0.034331560134887695,0.034569501876831055,0.034557342529296875,0.06989121437072754,0.08507347106933594,1.1393253803253174,0.3777151107788086,0.07349205017089844,0.06366872787475586,0.06853079795837402,0.10293054580688477,0.08727383613586426,0.09971451759338379,0.06117081642150879,0.10922479629516602,0.11061716079711914,0.060782432556152344,0.1079716682434082,0.10455036163330078,0.13826441764831543,0.13821172714233398,1.0960218906402588,0.41507434844970703,0.09657001495361328,0.09534668922424316,0.08187150955200195,0.09594202041625977,0.061792850494384766 diff --git a/results/combined/merges_timed/gephi/gephi.csv b/results/combined/merges_timed/gephi/gephi.csv index 42fc923cb0..90e466c3a1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,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,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,cfecdc3737d47f185c1e2c17cc42a1d600d72559701141edf3555e9b895d28e1,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,5d93ee3856cdf9a28a52e29bed25ad2b297d42fd1ef1f205d40a3d5cb3e11e30,Merge_timedout,,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.06722187995910645,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.22736668586730957,1.7211782932281494,-1.0,0.11074566841125488,0.1927475929260254,0.11376023292541504,0.19698023796081543,0.19443798065185547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,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,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,cfecdc3737d47f185c1e2c17cc42a1d600d72559701141edf3555e9b895d28e1,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,5d93ee3856cdf9a28a52e29bed25ad2b297d42fd1ef1f205d40a3d5cb3e11e30,Merge_timedout,,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,Tests_passed,927375fdb6449d4eed53574dafadb7aec75f341d01795ca00dcfa9c95b8e9e89,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.06722187995910645,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.22736668586730957,1.7211782932281494,-1.0,0.11074566841125488,0.1927475929260254,0.11376023292541504,0.19698023796081543,0.19443798065185547,0.17732620239257812,0.18560504913330078,0.19101619720458984,0.197127103805542,0.19481515884399414,0.18448567390441895,0.1932682991027832,0.2783815860748291,0.26202988624572754,1.830204725265503,-1.0,0.17475128173828125,0.17312860488891602,0.17598795890808105,0.16646480560302734,0.17063617706298828 diff --git a/results/combined/merges_timed/getbridge/bridge-java.csv b/results/combined/merges_timed/getbridge/bridge-java.csv index 610ee28f4f..9f5d7d798b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,True,12,40,942,3,True,12,Tests_passed,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,True,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,7c36de8f2681f99e91b43c5160b3d238ee7542eaa03f122405b303be8e2f6a4f,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,Merge_failed,476f0af5d8f7a6db9be0b0754b4d5a8e9f67798aa854f642350839a006fed8e0,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,4d738f35e81e5569ed6995623d0f5977d8f8ea8bf08249f6bcda3d35b2bcdeff,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,7bf4e50e0dfddced8aa914d3ac575925db4f930e9e9c9eca1d27a8c356ca1808,Tests_failed,3189fa44df6ef66ef48850f303cb9a82cbbe8fd2bdf96259bfcae69a7032369c,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,0.039006710052490234,0.04354596138000488,0.04274892807006836,0.014954805374145508,0.03576517105102539,0.045049428939819336,0.03934764862060547,0.22788643836975098,0.18034982681274414,1.5179078578948975,0.48279404640197754,0.044162750244140625,0.0652766227722168,0.04182696342468262,0.06615805625915527,0.07054710388183594 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,True,12,40,942,3,True,12,Tests_passed,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,True,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,7c36de8f2681f99e91b43c5160b3d238ee7542eaa03f122405b303be8e2f6a4f,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,Merge_failed,476f0af5d8f7a6db9be0b0754b4d5a8e9f67798aa854f642350839a006fed8e0,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,4d738f35e81e5569ed6995623d0f5977d8f8ea8bf08249f6bcda3d35b2bcdeff,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,7bf4e50e0dfddced8aa914d3ac575925db4f930e9e9c9eca1d27a8c356ca1808,Tests_failed,3189fa44df6ef66ef48850f303cb9a82cbbe8fd2bdf96259bfcae69a7032369c,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,0.039006710052490234,0.04354596138000488,0.04274892807006836,0.014954805374145508,0.03576517105102539,0.045049428939819336,0.03934764862060547,0.22788643836975098,0.18034982681274414,1.5179078578948975,0.48279404640197754,0.044162750244140625,0.0652766227722168,0.04182696342468262,0.06615805625915527,0.07054710388183594,0.06278443336486816,0.06701374053955078,0.06293892860412598,0.06601881980895996,0.06652379035949707,0.06503629684448242,0.0687558650970459,0.11342048645019531,0.12520170211791992,1.5872297286987305,0.5626649856567383,0.06370115280151367,0.062282562255859375,0.06367659568786621,0.0614933967590332,0.06776762008666992 diff --git a/results/combined/merges_timed/ghillairet/emfjson.csv b/results/combined/merges_timed/ghillairet/emfjson.csv index 664a264ab5..dfecbc660c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,True,34,719,2696,3,True,34,Tests_passed,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,True,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,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,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,36a032587302bbc937fa16fb815e404c32145a52fcfcd81b7f15e7c729886c59,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,b652d8d1cb9a96edb623e864f266b47462db8a542e96bf3b98d52e95a801259a,Merge_timedout,,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,0.01703333854675293,0.017342805862426758,0.019044160842895508,0.029067039489746094,0.01949787139892578,0.019590139389038086,0.01914215087890625,0.06914091110229492,0.1309065818786621,1.545112133026123,-1.0,0.07641434669494629,0.0770578384399414,0.059241533279418945,0.07594728469848633,0.07989335060119629 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,True,34,719,2696,3,True,34,Tests_passed,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,True,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,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,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,36a032587302bbc937fa16fb815e404c32145a52fcfcd81b7f15e7c729886c59,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,b652d8d1cb9a96edb623e864f266b47462db8a542e96bf3b98d52e95a801259a,Merge_timedout,,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,0.01703333854675293,0.017342805862426758,0.019044160842895508,0.029067039489746094,0.01949787139892578,0.019590139389038086,0.01914215087890625,0.06914091110229492,0.1309065818786621,1.545112133026123,-1.0,0.07641434669494629,0.0770578384399414,0.059241533279418945,0.07594728469848633,0.07989335060119629,0.07613062858581543,0.06535673141479492,0.07854771614074707,0.07688331604003906,0.07914853096008301,0.07828998565673828,0.07544851303100586,0.13205766677856445,0.15418601036071777,1.7274854183197021,-1.0,0.07607364654541016,0.07246851921081543,0.07264018058776855,0.07455134391784668,0.07542133331298828 diff --git a/results/combined/merges_timed/giltene/jhiccup.csv b/results/combined/merges_timed/giltene/jhiccup.csv index 9357cdbb62..2a08fd16bd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,True,6,8,14,2,True,6,Tests_passed,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,True,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,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,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,2304916f1cc3a646a9bc96f792b2d413e6e16ed2b0c47745182a02be6da96e7c,Tests_failed,de14b5bb9cb6210a261ff8d03c60299a90dbd6da0a28c9e6263e810af94e3cce,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,0.04380512237548828,0.04679250717163086,0.04210352897644043,0.018615007400512695,0.0547184944152832,0.050103187561035156,0.044306278228759766,0.17638349533081055,0.10360598564147949,0.5432846546173096,0.396148681640625,0.034657955169677734,0.060617923736572266,0.035166025161743164,0.05985426902770996,0.060906171798706055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,True,6,8,14,2,True,6,Tests_passed,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,True,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,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,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,2304916f1cc3a646a9bc96f792b2d413e6e16ed2b0c47745182a02be6da96e7c,Tests_failed,de14b5bb9cb6210a261ff8d03c60299a90dbd6da0a28c9e6263e810af94e3cce,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,000ffc72523fbb69f1ec3ce2dfb1dde4eacb5f444caf92564cfa336db114829d,Tests_passed,cc7cb6463926fdf93ef10a86beb86e2ea2bdb3221862a174335c68831f9917f9,0.04380512237548828,0.04679250717163086,0.04210352897644043,0.018615007400512695,0.0547184944152832,0.050103187561035156,0.044306278228759766,0.17638349533081055,0.10360598564147949,0.5432846546173096,0.396148681640625,0.034657955169677734,0.060617923736572266,0.035166025161743164,0.05985426902770996,0.060906171798706055,0.05978679656982422,0.06106257438659668,0.062151432037353516,0.06385016441345215,0.05964350700378418,0.06090712547302246,0.060975074768066406,0.09654808044433594,0.09426736831665039,0.645993709564209,0.42859935760498047,0.05786418914794922,0.06073737144470215,0.05920553207397461,0.05929160118103027,0.0599513053894043 diff --git a/results/combined/merges_timed/gini/dropwizard-gelf.csv b/results/combined/merges_timed/gini/dropwizard-gelf.csv index 10ec566577..506a54e5b4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,True,True,Tests_passed,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,True,9,20,57,4,True,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,True,9,True,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,7a93f13f1e4280edcbd8412cce3f92aaf82a9a5df884102a0ed302d64d4925bd,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,189072adb496c4c5db3c0505259ff573afd2bfb7bd455019f4df9703251eb4c7,Merge_failed,51ba831282caf9ddbfaee71e3f5731f83766eecc371808e5f12b3dba56a60fe1,Merge_failed,141730d4b4aaf3e421806cbd78989c1a7422199770fbe0efac1b4d3a652f6c05,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,0.007695436477661133,0.007870674133300781,0.007933616638183594,0.01395726203918457,0.007956266403198242,0.008195638656616211,0.008347272872924805,0.05582594871520996,0.17441821098327637,0.7540080547332764,0.2860708236694336,0.05122017860412598,0.0735476016998291,0.053231239318847656,0.07898640632629395,0.08098578453063965 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,True,True,Tests_passed,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,True,9,20,57,4,True,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,True,9,True,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,7a93f13f1e4280edcbd8412cce3f92aaf82a9a5df884102a0ed302d64d4925bd,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,189072adb496c4c5db3c0505259ff573afd2bfb7bd455019f4df9703251eb4c7,Merge_failed,51ba831282caf9ddbfaee71e3f5731f83766eecc371808e5f12b3dba56a60fe1,Merge_failed,141730d4b4aaf3e421806cbd78989c1a7422199770fbe0efac1b4d3a652f6c05,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,Merge_failed,2d85c3189f26700d4e10fa8a875b198236557941465569e82c4d1b329bccca2a,0.007695436477661133,0.007870674133300781,0.007933616638183594,0.01395726203918457,0.007956266403198242,0.008195638656616211,0.008347272872924805,0.05582594871520996,0.17441821098327637,0.7540080547332764,0.2860708236694336,0.05122017860412598,0.0735476016998291,0.053231239318847656,0.07898640632629395,0.08098578453063965,0.07853960990905762,0.07702183723449707,0.07621145248413086,0.07651734352111816,0.07606363296508789,0.07809019088745117,0.07551741600036621,0.14027667045593262,0.1618633270263672,0.8425817489624023,0.3764166831970215,0.07680606842041016,0.07829403877258301,0.07710075378417969,0.07763290405273438,0.07687664031982422 diff --git a/results/combined/merges_timed/gitools/gitools.csv b/results/combined/merges_timed/gitools/gitools.csv index 15f50af929..c8c5d5ce85 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -67,refs/heads/develop,f3903af522feb02e11fd24b68fe5c1d56608aa60,a257a960764251de0a98fd364a0249f69e965901,92155a3fbda034802dc90b8c6f99933fc812d9f6,,True,True,Tests_passed,faa95e610ff712a31bb03f0ef96692efeca0545d9af00aac376264d1270ed459,True,16,27,333,2,True,Tests_passed,7798b09efc2001f0d641acf0875b043bef91c1906ea8ea849b0bfc1aed32dbec,True,16,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,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_failed,abaf6b93ee547b76aea2f2e0d2d04baf49dfa7244e08433357d228b24cd8d2f4,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,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,0a511bfb69adab5d79340334ba5a5789f34c912cb972365bbf94f0fe4df768f5,Tests_failed,abaf6b93ee547b76aea2f2e0d2d04baf49dfa7244e08433357d228b24cd8d2f4,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,0.07227277755737305,0.06765937805175781,0.06451225280761719,0.02520585060119629,0.06283330917358398,0.04851126670837402,0.06457734107971191,0.18639564514160156,0.11374831199645996,0.8357946872711182,0.6838836669921875,0.04873299598693848,0.07147574424743652,0.046739816665649414,0.07382345199584961,0.07243561744689941 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +67,refs/heads/develop,f3903af522feb02e11fd24b68fe5c1d56608aa60,a257a960764251de0a98fd364a0249f69e965901,92155a3fbda034802dc90b8c6f99933fc812d9f6,,True,True,Tests_passed,faa95e610ff712a31bb03f0ef96692efeca0545d9af00aac376264d1270ed459,True,16,27,333,2,True,Tests_passed,7798b09efc2001f0d641acf0875b043bef91c1906ea8ea849b0bfc1aed32dbec,True,16,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,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_failed,abaf6b93ee547b76aea2f2e0d2d04baf49dfa7244e08433357d228b24cd8d2f4,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,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,0a511bfb69adab5d79340334ba5a5789f34c912cb972365bbf94f0fe4df768f5,Tests_failed,abaf6b93ee547b76aea2f2e0d2d04baf49dfa7244e08433357d228b24cd8d2f4,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,0.07227277755737305,0.06765937805175781,0.06451225280761719,0.02520585060119629,0.06283330917358398,0.04851126670837402,0.06457734107971191,0.18639564514160156,0.11374831199645996,0.8357946872711182,0.6838836669921875,0.04873299598693848,0.07147574424743652,0.046739816665649414,0.07382345199584961,0.07243561744689941,0.07159185409545898,0.06926608085632324,0.06929254531860352,0.06848931312561035,0.07114148139953613,0.06952023506164551,0.06998276710510254,0.10874652862548828,0.10030221939086914,0.8713333606719971,0.7239248752593994,0.06661176681518555,0.06820249557495117,0.06800627708435059,0.06804800033569336,0.06723642349243164 diff --git a/results/combined/merges_timed/giusepperizzo/nerd4java.csv b/results/combined/merges_timed/giusepperizzo/nerd4java.csv index 56568ab419..e39bc7f7b2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,True,2,2,52,2,True,2,Tests_passed,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,True,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,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,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,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,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,bfe8e9ffe7fb3cbee4eed7f4c8c432b0775078f0419149a028a41447746188d0,Tests_failed,0bd4ca667533bc051f0ae49b51cc08ace4a8f55afb0fd484061983ab45f767e6,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,0.03541731834411621,0.04048347473144531,0.03926539421081543,0.013223886489868164,0.03510928153991699,0.03944277763366699,0.041933298110961914,0.16466879844665527,0.11331558227539062,0.4801347255706787,0.23084306716918945,0.029004812240600586,0.051305532455444336,0.02831554412841797,0.05068087577819824,0.05068778991699219 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,True,2,2,52,2,True,2,Tests_passed,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,True,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,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,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,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,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,bfe8e9ffe7fb3cbee4eed7f4c8c432b0775078f0419149a028a41447746188d0,Tests_failed,0bd4ca667533bc051f0ae49b51cc08ace4a8f55afb0fd484061983ab45f767e6,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,0.03541731834411621,0.04048347473144531,0.03926539421081543,0.013223886489868164,0.03510928153991699,0.03944277763366699,0.041933298110961914,0.16466879844665527,0.11331558227539062,0.4801347255706787,0.23084306716918945,0.029004812240600586,0.051305532455444336,0.02831554412841797,0.05068087577819824,0.05068778991699219,0.04974722862243652,0.04921412467956543,0.05001020431518555,0.049775123596191406,0.048534393310546875,0.04851651191711426,0.048360347747802734,0.08079361915588379,0.07840728759765625,0.5083694458007812,0.2555217742919922,0.04904675483703613,0.0484929084777832,0.04769015312194824,0.04889798164367676,0.049685001373291016 diff --git a/results/combined/merges_timed/glamdring/aardwark.csv b/results/combined/merges_timed/glamdring/aardwark.csv index a13835d11c..604d2344a2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,True,4,42,208,3,True,4,Tests_passed,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,True,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,4f7241f3fd33c9fe3e20b08b277a43ecbf1a53196bf2b03be6e83a52e521de6e,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,17119d4e7900233b6db795880d95fae30c24fcbf3d0c883797ded19598a32079,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,e645dd3d2027501a4f85255a4e72c6262574e42184e8f55a7e7bc92d63978c1a,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,63251be80be2a2b275451c8425a58c05a84973de23bce3101637c0d5567e318b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,0.04043436050415039,0.0368497371673584,0.04034423828125,0.01322317123413086,0.039563894271850586,0.04023909568786621,0.04023480415344238,0.22007083892822266,0.16844654083251953,1.0568814277648926,0.4681994915008545,0.05083203315734863,0.052674055099487305,0.050673723220825195,0.05280876159667969,0.05849742889404297 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,True,4,42,208,3,True,4,Tests_passed,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,True,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,4f7241f3fd33c9fe3e20b08b277a43ecbf1a53196bf2b03be6e83a52e521de6e,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,17119d4e7900233b6db795880d95fae30c24fcbf3d0c883797ded19598a32079,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,e645dd3d2027501a4f85255a4e72c6262574e42184e8f55a7e7bc92d63978c1a,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,63251be80be2a2b275451c8425a58c05a84973de23bce3101637c0d5567e318b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d2af07104b8a8009577588d877503db6b57de108db567236dc5104471c8f9bf3,0.04043436050415039,0.0368497371673584,0.04034423828125,0.01322317123413086,0.039563894271850586,0.04023909568786621,0.04023480415344238,0.22007083892822266,0.16844654083251953,1.0568814277648926,0.4681994915008545,0.05083203315734863,0.052674055099487305,0.050673723220825195,0.05280876159667969,0.05849742889404297,0.05223393440246582,0.05852937698364258,0.05238533020019531,0.05839991569519043,0.05242419242858887,0.05304145812988281,0.05280923843383789,0.10172557830810547,0.12274050712585449,1.188147783279419,0.5473728179931641,0.052774906158447266,0.05234837532043457,0.053297996520996094,0.0536344051361084,0.05772972106933594 diff --git a/results/combined/merges_timed/glenkpeterson/fp4java7.csv b/results/combined/merges_timed/glenkpeterson/fp4java7.csv index 8db50c7446..9e30b63acd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,20916d386bbaf85523027306c602b80e9adc72234b2a968dc1d7605bbefb5206,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.0763552188873291,0.07716488838195801,0.09298086166381836,0.09430360794067383,0.08066844940185547,0.08858489990234375,0.08294558525085449,0.9754092693328857,0.8740217685699463,15.489113092422485,3.0375924110412598,0.25600147247314453,0.45671963691711426,0.21941232681274414,0.44280242919921875,0.48834896087646484 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,20916d386bbaf85523027306c602b80e9adc72234b2a968dc1d7605bbefb5206,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.0763552188873291,0.07716488838195801,0.09298086166381836,0.09430360794067383,0.08066844940185547,0.08858489990234375,0.08294558525085449,0.9754092693328857,0.8740217685699463,15.489113092422485,3.0375924110412598,0.25600147247314453,0.45671963691711426,0.21941232681274414,0.44280242919921875,0.48834896087646484,0.4791853427886963,0.4951207637786865,0.4926574230194092,0.43959999084472656,0.4994924068450928,0.49976563453674316,0.5057673454284668,0.7494981288909912,0.8809936046600342,17.408690214157104,3.574610471725464,0.5090913772583008,0.4645233154296875,0.49186062812805176,0.5000648498535156,0.42850327491760254 diff --git a/results/combined/merges_timed/glenkpeterson/j-cicle.csv b/results/combined/merges_timed/glenkpeterson/j-cicle.csv index e8b4d29bf4..dc469ef124 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,0fc54136a6efe972b00362ee790aefb40016711d2c0dade4cdaabcbc6e09cd0c,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.06952524185180664,0.07091760635375977,0.08957076072692871,0.08722496032714844,0.07971477508544922,0.08589744567871094,0.08394312858581543,0.9148585796356201,0.8695683479309082,15.517658233642578,2.9059269428253174,0.24065876007080078,0.44576358795166016,0.20859980583190918,0.40735507011413574,0.4726095199584961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,0fc54136a6efe972b00362ee790aefb40016711d2c0dade4cdaabcbc6e09cd0c,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.06952524185180664,0.07091760635375977,0.08957076072692871,0.08722496032714844,0.07971477508544922,0.08589744567871094,0.08394312858581543,0.9148585796356201,0.8695683479309082,15.517658233642578,2.9059269428253174,0.24065876007080078,0.44576358795166016,0.20859980583190918,0.40735507011413574,0.4726095199584961,0.3935108184814453,0.46494531631469727,0.4149913787841797,0.4792652130126953,0.400740385055542,0.47655653953552246,0.49477124214172363,0.7545156478881836,0.8479061126708984,15.867616415023804,3.2402350902557373,0.47431039810180664,0.41458916664123535,0.46626830101013184,0.40151238441467285,0.46775197982788086 diff --git a/results/combined/merges_timed/glenkpeterson/j-sicle.csv b/results/combined/merges_timed/glenkpeterson/j-sicle.csv index de9f41fd37..b32529aa1a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,d264db56cfdfe2a0903539f518d381cb36bcf4745e340913a5617c64f5931c95,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.07547259330749512,0.07674622535705566,0.08587813377380371,0.09160637855529785,0.08372211456298828,0.0804588794708252,0.08191323280334473,0.9583835601806641,0.8713035583496094,15.763499736785889,2.842805862426758,0.24801039695739746,0.43643951416015625,0.2198038101196289,0.4796266555786133,0.40291523933410645 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,86b9f0195580f9065539f7958ebd4890ea5b0fb241618109d9bd011d6460f277,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,8cd40183b2fea8aaccadff05e43f85231936b674817faaef222d1cf71b09ec58,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,fc80dfba9ccd9c3c1a1202643648f92ea60238e8c89128a35df18c509daa99c5,Merge_failed,73d69c7ebd0e35c8c27953fe8cb3ce75b217b7b4ad6a082f39306a17ead32084,Merge_failed,d264db56cfdfe2a0903539f518d381cb36bcf4745e340913a5617c64f5931c95,Merge_failed,26e1c190d6b27ff647172446a32a8aab7232f0f017aeb4dd12bde6f47fee1e9c,Merge_failed,9664c1bfddf3e656772dcede55641b68f7fc3b52a4760b7959c08b0fcab5e14b,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,53f02fbb13d1b83417ac93d60800de5243998a5221ce3c75b09f6bf1f094875c,Merge_failed,67e776dfe04faf2745ba92f724a369e0fb6c3e6f5d7a2c1cca3b64626220e0df,0.07547259330749512,0.07674622535705566,0.08587813377380371,0.09160637855529785,0.08372211456298828,0.0804588794708252,0.08191323280334473,0.9583835601806641,0.8713035583496094,15.763499736785889,2.842805862426758,0.24801039695739746,0.43643951416015625,0.2198038101196289,0.4796266555786133,0.40291523933410645,0.4682350158691406,0.40926361083984375,0.4775710105895996,0.46560215950012207,0.4752771854400635,0.48153138160705566,0.4300863742828369,0.8204479217529297,0.8546061515808105,16.138742208480835,3.415717840194702,0.46791815757751465,0.4708268642425537,0.4197831153869629,0.4784088134765625,0.4135730266571045 diff --git a/results/combined/merges_timed/glowroot/glowroot.csv b/results/combined/merges_timed/glowroot/glowroot.csv index e9ad5e6e13..59c92b78b6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,True,437,1583,8291,4,True,437,Tests_passed,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,True,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,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_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,dfe57a9849537e90138094b923deed436a30ec46ccd3e77edd1d3f4cc146122d,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,0.1112508773803711,0.11385107040405273,0.13102293014526367,0.15688562393188477,0.1291975975036621,0.12977027893066406,0.13034915924072266,0.28981733322143555,0.2781994342803955,0.11524629592895508,13.31128478050232,0.26177978515625,0.4023289680480957,0.23653388023376465,0.39992690086364746,0.40879368782043457 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,True,437,1583,8291,4,True,437,Tests_passed,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,True,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,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_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,dfe57a9849537e90138094b923deed436a30ec46ccd3e77edd1d3f4cc146122d,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,Tests_failed,c4fcee47f7cd3c92bef5a6da86e9f313a1b2a6ad5758f00f4bfd7c854d51bfba,0.1112508773803711,0.11385107040405273,0.13102293014526367,0.15688562393188477,0.1291975975036621,0.12977027893066406,0.13034915924072266,0.28981733322143555,0.2781994342803955,0.11524629592895508,13.31128478050232,0.26177978515625,0.4023289680480957,0.23653388023376465,0.39992690086364746,0.40879368782043457,0.4017672538757324,0.3800010681152344,0.43042898178100586,0.41988396644592285,0.4120807647705078,0.3888423442840576,0.4327573776245117,0.5950255393981934,0.5432314872741699,0.46839046478271484,11.572567462921143,0.399918794631958,0.40946412086486816,0.41485047340393066,0.4055171012878418,0.4037618637084961 diff --git a/results/combined/merges_timed/gooddata/gooddata-cl.csv b/results/combined/merges_timed/gooddata/gooddata-cl.csv index 3646c3c44d..b8b5af8144 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -101,refs/heads/master,18faa1c4c7f3b77e27be62e841e0f5959941334c,6a016ec9d17f2137a87b6eaa2d8d118238d66299,99e0c47c5fbfbcb85a06fb95003c32c1ada9a606,,True,True,Tests_passed,fd6e17a570774e974af64700645bfef8570d05f3f680b458fcc51e537571f62d,True,16,76,682.0,2,True,Tests_passed,ea47282fc6151656c888d2979883d9cbc9257fe57cc3f20f837db37db441b8cd,True,16,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,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,15d205bbbfeb954e5ad8b245cc4f725e33410c4872ed730cb295caef9f97e6dd,Tests_failed,0fbf4bbaa970288e969bf82645024d3cea061fd9d62be1395380a6f0e0630a2e,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,0.01885533332824707,0.01935410499572754,0.024562835693359375,0.03426051139831543,0.024566173553466797,0.024010896682739258,0.024160146713256836,0.05366802215576172,0.07465958595275879,1.134699821472168,0.4466562271118164,0.055742740631103516,0.06447076797485352,0.055185794830322266,0.08984899520874023,0.09069299697875977 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +101,refs/heads/master,18faa1c4c7f3b77e27be62e841e0f5959941334c,6a016ec9d17f2137a87b6eaa2d8d118238d66299,99e0c47c5fbfbcb85a06fb95003c32c1ada9a606,,True,True,Tests_passed,fd6e17a570774e974af64700645bfef8570d05f3f680b458fcc51e537571f62d,True,16,76,682.0,2,True,Tests_passed,ea47282fc6151656c888d2979883d9cbc9257fe57cc3f20f837db37db441b8cd,True,16,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,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,15d205bbbfeb954e5ad8b245cc4f725e33410c4872ed730cb295caef9f97e6dd,Tests_failed,0fbf4bbaa970288e969bf82645024d3cea061fd9d62be1395380a6f0e0630a2e,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,318f434bc12272b71e061567edb045ded8e4b5ced1f663820757e3b1375abbbf,Tests_passed,c9213f90d919dbe1a0b1dcb52b3b5b3c1a8ca3d73156bdd9192dc868c5bb6c9c,0.01885533332824707,0.01935410499572754,0.024562835693359375,0.03426051139831543,0.024566173553466797,0.024010896682739258,0.024160146713256836,0.05366802215576172,0.07465958595275879,1.134699821472168,0.4466562271118164,0.055742740631103516,0.06447076797485352,0.055185794830322266,0.08984899520874023,0.09069299697875977,0.08503556251525879,0.08450818061828613,0.08913183212280273,0.08698654174804688,0.08743834495544434,0.09282946586608887,0.08797597885131836,0.12322783470153809,0.11851716041564941,1.2401096820831299,0.44955873489379883,0.08292269706726074,0.08624839782714844,0.08555054664611816,0.08358526229858398,0.08491277694702148 diff --git a/results/combined/merges_timed/google/closure-stylesheets.csv b/results/combined/merges_timed/google/closure-stylesheets.csv index 8da955a614..dad82f1c40 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,True,True,Tests_passed,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,True,162,2577,11090,5,True,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,True,162,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_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,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_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5ee4b4096fcdb0d325171fe7e746eb15ee20df10457d751a820b3f3472df471b,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,0.06411147117614746,0.06545090675354004,0.06354260444641113,0.053804636001586914,0.07178592681884766,0.08006119728088379,0.08917021751403809,0.38390326499938965,0.272322416305542,3.4496538639068604,2.322031259536743,0.08518767356872559,0.1850447654724121,0.0903937816619873,0.16357803344726562,0.17261791229248047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,True,True,Tests_passed,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,True,162,2577,11090,5,True,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,True,162,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_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,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_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5ee4b4096fcdb0d325171fe7e746eb15ee20df10457d751a820b3f3472df471b,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,0.06411147117614746,0.06545090675354004,0.06354260444641113,0.053804636001586914,0.07178592681884766,0.08006119728088379,0.08917021751403809,0.38390326499938965,0.272322416305542,3.4496538639068604,2.322031259536743,0.08518767356872559,0.1850447654724121,0.0903937816619873,0.16357803344726562,0.17261791229248047,0.17076349258422852,0.1707301139831543,0.1743016242980957,0.1717393398284912,0.19137930870056152,0.16856908798217773,0.17305302619934082,0.28298115730285645,0.2912583351135254,4.234418153762817,2.660918712615967,0.16952300071716309,0.16845917701721191,0.16982769966125488,0.1679525375366211,0.17420196533203125 diff --git a/results/combined/merges_timed/google/compile-testing.csv b/results/combined/merges_timed/google/compile-testing.csv index 8f9ba09f5c..8ca7675c50 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,True,14,64,548,2,True,14,Tests_passed,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,True,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,True,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,fc29f1f7ea14f6d80b25f5d80bb72c8339f6dcb83a6734a2b561234b2a84c39b,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,150b3193cecff6e575d159a25071bb816db9450586612e9cdfbea85b1f3b15f0,Tests_failed,43551657909aa926c116ea4dc2d79ef4bbe1bfa474dd580f6db69e605c3856cf,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,0.0338749885559082,0.03620719909667969,0.040280818939208984,0.014207124710083008,0.04198789596557617,0.04385256767272949,0.036193132400512695,0.16551804542541504,0.11100387573242188,0.8191583156585693,2.758607864379883,0.04070329666137695,0.05316424369812012,0.03969907760620117,0.05364346504211426,0.05558037757873535 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,True,14,64,548,2,True,14,Tests_passed,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,True,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,True,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,fc29f1f7ea14f6d80b25f5d80bb72c8339f6dcb83a6734a2b561234b2a84c39b,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,150b3193cecff6e575d159a25071bb816db9450586612e9cdfbea85b1f3b15f0,Tests_failed,43551657909aa926c116ea4dc2d79ef4bbe1bfa474dd580f6db69e605c3856cf,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,Tests_failed,d2e40ee1d0ad3c43b896eca336e796aeaf8b4fafe9ece044093c08349ef98ab2,0.0338749885559082,0.03620719909667969,0.040280818939208984,0.014207124710083008,0.04198789596557617,0.04385256767272949,0.036193132400512695,0.16551804542541504,0.11100387573242188,0.8191583156585693,2.758607864379883,0.04070329666137695,0.05316424369812012,0.03969907760620117,0.05364346504211426,0.05558037757873535,0.052451372146606445,0.05191516876220703,0.05193042755126953,0.05255699157714844,0.05188250541687012,0.050768136978149414,0.05262041091918945,0.0809929370880127,0.08466839790344238,0.7837669849395752,2.766616106033325,0.051767826080322266,0.052052974700927734,0.05214405059814453,0.052556514739990234,0.05248069763183594 diff --git a/results/combined/merges_timed/google/error-prone.csv b/results/combined/merges_timed/google/error-prone.csv index 8d55bef442..d7f25f61c0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,True,5,11,47.0,3,True,5,Tests_passed,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,True,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,True,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,8c1c887aa3a90b51389033d85a621c235896337274fd0ab17dedd0f497b1fcdd,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,799db051df2f5796f18d313909095899a7c1479708fdea67ebaab11a291f15ca,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,67401ce8ac58b34f60b3700bc2f32953cb4cfefc489e926876e2707907935f05,Tests_passed,94a6c366af7444a49bc2401a5beb2f139daadfb0e0e4516076ee6737a4b15a8e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Tests_failed,34898b5b69d7e77dc7731737ed8862ebe8523903a3c247e1a2b94c28b7c8832b,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,0.01760697364807129,0.018378257751464844,0.016532182693481445,0.02456045150756836,0.016633987426757812,0.017181873321533203,0.016862869262695312,0.1194908618927002,0.13504314422607422,0.021723508834838867,0.3389017581939697,0.07219219207763672,0.07016420364379883,0.0671844482421875,0.07016611099243164,0.06980037689208984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,True,5,11,47.0,3,True,5,Tests_passed,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,True,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,True,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,8c1c887aa3a90b51389033d85a621c235896337274fd0ab17dedd0f497b1fcdd,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,799db051df2f5796f18d313909095899a7c1479708fdea67ebaab11a291f15ca,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,67401ce8ac58b34f60b3700bc2f32953cb4cfefc489e926876e2707907935f05,Tests_passed,94a6c366af7444a49bc2401a5beb2f139daadfb0e0e4516076ee6737a4b15a8e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Tests_failed,34898b5b69d7e77dc7731737ed8862ebe8523903a3c247e1a2b94c28b7c8832b,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,0.01760697364807129,0.018378257751464844,0.016532182693481445,0.02456045150756836,0.016633987426757812,0.017181873321533203,0.016862869262695312,0.1194908618927002,0.13504314422607422,0.021723508834838867,0.3389017581939697,0.07219219207763672,0.07016420364379883,0.0671844482421875,0.07016611099243164,0.06980037689208984,0.07097268104553223,0.06870651245117188,0.06769895553588867,0.06744074821472168,0.06679630279541016,0.0687108039855957,0.07059454917907715,0.12544035911560059,0.1697547435760498,0.08615446090698242,0.44344162940979004,0.07038569450378418,0.06894159317016602,0.07230663299560547,0.06923055648803711,0.06657958030700684 diff --git a/results/combined/merges_timed/google/google-java-format.csv b/results/combined/merges_timed/google/google-java-format.csv index 841bd0cd89..13ce1deb71 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,True,8,26,91,3,True,8,Tests_passed,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,True,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,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,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Tests_failed,dc9dfd5b92c0c56ce6537f6922a3ebb94a51ff5cf9e13941af84ddc60dcb8e53,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,5a722a946c66a0367c66192a6af87f0b33da0c562395ac73b0f00caf11e75e0f,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,5ae2e78903b57b890b00c2054fecd32f5b5a13c1ea6dcd57b6ff52d8c5f5f156,Tests_failed,47c562dea69ce777866333700a2c4e4c12fe9269108510d8fe1c6c4b30868b6f,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.01607656478881836,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.15688300132751465,1.8062303066253662,0.5100493431091309,0.04443168640136719,0.06530594825744629,0.06099200248718262,0.06570982933044434,0.06712794303894043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,True,8,26,91,3,True,8,Tests_passed,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,True,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,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,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Tests_failed,dc9dfd5b92c0c56ce6537f6922a3ebb94a51ff5cf9e13941af84ddc60dcb8e53,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,5a722a946c66a0367c66192a6af87f0b33da0c562395ac73b0f00caf11e75e0f,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,5ae2e78903b57b890b00c2054fecd32f5b5a13c1ea6dcd57b6ff52d8c5f5f156,Tests_failed,47c562dea69ce777866333700a2c4e4c12fe9269108510d8fe1c6c4b30868b6f,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.01607656478881836,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.15688300132751465,1.8062303066253662,0.5100493431091309,0.04443168640136719,0.06530594825744629,0.06099200248718262,0.06570982933044434,0.06712794303894043,0.06447649002075195,0.06561541557312012,0.06524491310119629,0.0641946792602539,0.06166672706604004,0.06328868865966797,0.06348991394042969,0.1133425235748291,0.13414263725280762,1.807868242263794,0.5965018272399902,0.06349492073059082,0.06295967102050781,0.06276392936706543,0.06241130828857422,0.0626077651977539 diff --git a/results/combined/merges_timed/google/guice.csv b/results/combined/merges_timed/google/guice.csv index 52c54b8138..36c0b7505d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,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,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,4b1f7169903677d1bfc1be6060054fed32410e0fcd31086ed1de16115f49c2b0,Merge_failed,33119ba357758f95fcdf072449265bd56ec2b9f8a25d026e35ba1a2d5df3d9a2,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.03645515441894531,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.15186333656311035,0.06041073799133301,2.5551888942718506,0.07961726188659668,0.10173487663269043,0.08346843719482422,0.09849834442138672,0.10330438613891602 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,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,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,4b1f7169903677d1bfc1be6060054fed32410e0fcd31086ed1de16115f49c2b0,Merge_failed,33119ba357758f95fcdf072449265bd56ec2b9f8a25d026e35ba1a2d5df3d9a2,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,e16658a9d70ec26369de32e8e444ac9d89234f4d984044339068936e52f651fd,Merge_failed,ed895b5daeff0d562c6adae7ed7a39a463dec6f5fb044e3fedd137dce61b694a,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.03645515441894531,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.15186333656311035,0.06041073799133301,2.5551888942718506,0.07961726188659668,0.10173487663269043,0.08346843719482422,0.09849834442138672,0.10330438613891602,0.1007835865020752,0.10356545448303223,0.10798168182373047,0.10474157333374023,0.10635900497436523,0.10663604736328125,0.1019124984741211,0.16799283027648926,0.17820501327514648,1.3225898742675781,2.836132526397705,0.10177278518676758,0.10509610176086426,0.10384345054626465,0.10285234451293945,0.10461831092834473 diff --git a/results/combined/merges_timed/google/gwtmockito.csv b/results/combined/merges_timed/google/gwtmockito.csv index a4b6b46f8b..315679fada 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,True,5,8,125,2,True,5,Tests_passed,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,True,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,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,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,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,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,089621a5a0b1c1797a2f2805305e1eedf4ff6d8b636a9d3c81b5cedcbc1687f2,Tests_failed,ee5ab81b1edc67e0ade79a016580b85a8ebdefc0f5bdc1662d15740ba4e555ff,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,0.03579115867614746,0.04490041732788086,0.011561393737792969,0.01589226722717285,0.04535531997680664,0.04867100715637207,0.04729175567626953,0.16033220291137695,0.10518383979797363,0.9591810703277588,0.5035443305969238,0.03229689598083496,0.05939531326293945,0.03281712532043457,0.059514760971069336,0.05855917930603027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,True,5,8,125,2,True,5,Tests_passed,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,True,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,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,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,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,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,089621a5a0b1c1797a2f2805305e1eedf4ff6d8b636a9d3c81b5cedcbc1687f2,Tests_failed,ee5ab81b1edc67e0ade79a016580b85a8ebdefc0f5bdc1662d15740ba4e555ff,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,0.03579115867614746,0.04490041732788086,0.011561393737792969,0.01589226722717285,0.04535531997680664,0.04867100715637207,0.04729175567626953,0.16033220291137695,0.10518383979797363,0.9591810703277588,0.5035443305969238,0.03229689598083496,0.05939531326293945,0.03281712532043457,0.059514760971069336,0.05855917930603027,0.05460309982299805,0.055968284606933594,0.05599093437194824,0.0576329231262207,0.05764055252075195,0.0575101375579834,0.05545759201049805,0.0861961841583252,0.08699941635131836,1.001352071762085,0.5227851867675781,0.05514717102050781,0.056611061096191406,0.05666160583496094,0.054219722747802734,0.05652904510498047 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 46c2adbf23..7bd1f35b8f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,False,True,3,4,14,7,True,8,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,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,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,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,48d8c6b3ddcbb09c1fd0887cab509907ad76eb6cfd4cbb66d57dd46698110a25,Tests_failed,2be7f5623021ea5f377fe57ff49cc8c76cab53f8d62672b0621602264826bee7,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,0.044400930404663086,0.04256844520568848,0.04122185707092285,0.01602768898010254,0.0451812744140625,0.039623260498046875,0.043646812438964844,0.1410996913909912,0.10522770881652832,1.1406700611114502,0.4028971195220947,0.030541419982910156,0.06002187728881836,0.029807329177856445,0.05802655220031738,0.05672168731689453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,False,True,3,4,14,7,True,8,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,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,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,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,48d8c6b3ddcbb09c1fd0887cab509907ad76eb6cfd4cbb66d57dd46698110a25,Tests_failed,2be7f5623021ea5f377fe57ff49cc8c76cab53f8d62672b0621602264826bee7,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,0.044400930404663086,0.04256844520568848,0.04122185707092285,0.01602768898010254,0.0451812744140625,0.039623260498046875,0.043646812438964844,0.1410996913909912,0.10522770881652832,1.1406700611114502,0.4028971195220947,0.030541419982910156,0.06002187728881836,0.029807329177856445,0.05802655220031738,0.05672168731689453,0.05881667137145996,0.05816364288330078,0.06042075157165527,0.06016039848327637,0.05804848670959473,0.059961795806884766,0.059653520584106445,0.0914616584777832,0.0921938419342041,1.3189964294433594,0.47838902473449707,0.056833744049072266,0.05921626091003418,0.05898761749267578,0.05826616287231445,0.05696225166320801 diff --git a/results/combined/merges_timed/google/truth.csv b/results/combined/merges_timed/google/truth.csv index c5766e5cf8..50c912259f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,True,True,Tests_passed,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,True,10,73,344,3,True,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,True,10,True,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,f8281e339370b1a586d729ea7ffbd0e19c0e10197f8bd96b7e7d323176a11d86,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Tests_failed,a74d2c0d1ed40df295f4977d857bc033fc01618b3fb7ab444554a6acab88b442,Tests_passed,940d5cad02265db6e1fcb495c704b5f05ce21652694cf45ccc1b5043b3fcb3b0,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,31cfa0dc1f467c74c04b9035c8b1e80a2c8177374c6a301ad6e8bfa88cd1f9bd,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,85b664b0353c3cb6c4f5d8e4d7a3c9f072fe5be887449435af81b77344a479ae,Tests_failed,c8dc05c76ea0bb77eb80ab27bf99da7b6655d9b570720255f81eaf8323c30a26,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.014639854431152344,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.12194585800170898,1.2289559841156006,0.7890748977661133,0.06019425392150879,0.0556178092956543,0.05535078048706055,0.05883359909057617,0.06610798835754395 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,True,True,Tests_passed,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,True,10,73,344,3,True,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,True,10,True,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,f8281e339370b1a586d729ea7ffbd0e19c0e10197f8bd96b7e7d323176a11d86,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Tests_failed,a74d2c0d1ed40df295f4977d857bc033fc01618b3fb7ab444554a6acab88b442,Tests_passed,940d5cad02265db6e1fcb495c704b5f05ce21652694cf45ccc1b5043b3fcb3b0,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,31cfa0dc1f467c74c04b9035c8b1e80a2c8177374c6a301ad6e8bfa88cd1f9bd,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,85b664b0353c3cb6c4f5d8e4d7a3c9f072fe5be887449435af81b77344a479ae,Tests_failed,c8dc05c76ea0bb77eb80ab27bf99da7b6655d9b570720255f81eaf8323c30a26,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.014639854431152344,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.12194585800170898,1.2289559841156006,0.7890748977661133,0.06019425392150879,0.0556178092956543,0.05535078048706055,0.05883359909057617,0.06610798835754395,0.059651851654052734,0.06659984588623047,0.05701494216918945,0.06559133529663086,0.05772519111633301,0.05710649490356445,0.057677268981933594,0.10640931129455566,0.11878561973571777,1.4831795692443848,0.9349288940429688,0.05842089653015137,0.05700874328613281,0.059046268463134766,0.05938601493835449,0.0664815902709961 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv index ac5f0fdc0d..1a88503cdf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,True,9.0,26,503,2,True,9,Tests_passed,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,True,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,,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,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,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,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,de012961b2cf531474a2511045b6e23870a4ccbe857b0bba367604de79d1259c,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,0.0189969539642334,0.01877140998840332,0.022920846939086914,0.030039548873901367,0.02284526824951172,0.023261547088623047,0.02339458465576172,0.05188441276550293,0.0745542049407959,1.4598751068115234,0.7324018478393555,0.05462050437927246,0.08412957191467285,0.038115501403808594,0.08081412315368652,0.08290386199951172 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,True,9.0,26,503,2,True,9,Tests_passed,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,True,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,,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,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,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,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,de012961b2cf531474a2511045b6e23870a4ccbe857b0bba367604de79d1259c,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,0.0189969539642334,0.01877140998840332,0.022920846939086914,0.030039548873901367,0.02284526824951172,0.023261547088623047,0.02339458465576172,0.05188441276550293,0.0745542049407959,1.4598751068115234,0.7324018478393555,0.05462050437927246,0.08412957191467285,0.038115501403808594,0.08081412315368652,0.08290386199951172,0.06371903419494629,0.0659017562866211,0.06821250915527344,0.08576107025146484,0.09261775016784668,0.09314513206481934,0.09212327003479004,0.13177227973937988,0.09923100471496582,1.8026134967803955,0.8529617786407471,0.06659722328186035,0.07570981979370117,0.08544087409973145,0.08713650703430176,0.0810999870300293 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv index 4008d8b1b3..39ff81c723 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,True,10,54,371,2,True,10,Tests_passed,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,True,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,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,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,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,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,e79e9acefb3c9863865a88dbeb7bcca03058f848e8838436260014ad127e0044,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,0.009694814682006836,0.009704351425170898,0.010267019271850586,0.016407012939453125,0.010201454162597656,0.010245800018310547,0.010239839553833008,0.034464120864868164,0.06564879417419434,0.8232579231262207,0.48569440841674805,0.0340883731842041,0.05730271339416504,0.03359389305114746,0.05653238296508789,0.059636592864990234 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,True,10,54,371,2,True,10,Tests_passed,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,True,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,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,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,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,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,e79e9acefb3c9863865a88dbeb7bcca03058f848e8838436260014ad127e0044,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,0.009694814682006836,0.009704351425170898,0.010267019271850586,0.016407012939453125,0.010201454162597656,0.010245800018310547,0.010239839553833008,0.034464120864868164,0.06564879417419434,0.8232579231262207,0.48569440841674805,0.0340883731842041,0.05730271339416504,0.03359389305114746,0.05653238296508789,0.059636592864990234,0.059743404388427734,0.06117439270019531,0.061911582946777344,0.0597376823425293,0.061118364334106445,0.05930638313293457,0.0606536865234375,0.0945734977722168,0.0902719497680664,0.9884560108184814,0.5612349510192871,0.060164451599121094,0.058727264404296875,0.06003284454345703,0.06015467643737793,0.058042287826538086 diff --git a/results/combined/merges_timed/gpedro/slack-webhook.csv b/results/combined/merges_timed/gpedro/slack-webhook.csv index a568fc1c9d..abbdd5e3b4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,True,True,Tests_passed,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,True,11,97,1569,2,True,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,True,11,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,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Tests_failed,80c0982c27dd5b27c6639d36d6b0b46b8a692f0369afa27050eccb8aecdd02a5,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,cce1f930af684dec24355725ebedbbe3ddd81616fc4a06fa740725aa182f567f,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,d579b07f2c02fda11798651914d0efb57086d41ce43b75dafb3f9966fdca742b,Tests_failed,fc07236b28fd479621a6f69d4ee7dc08cf3dff11096314bfb97601c909094c0f,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,0.03994560241699219,0.04597592353820801,0.035974979400634766,0.014765262603759766,0.03873300552368164,0.03251242637634277,0.039237022399902344,0.16608262062072754,0.10605573654174805,0.6003727912902832,0.3472268581390381,0.038498878479003906,0.040521860122680664,0.039327383041381836,0.04061388969421387,0.0523066520690918 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,True,True,Tests_passed,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,True,11,97,1569,2,True,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,True,11,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,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Tests_failed,80c0982c27dd5b27c6639d36d6b0b46b8a692f0369afa27050eccb8aecdd02a5,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,cce1f930af684dec24355725ebedbbe3ddd81616fc4a06fa740725aa182f567f,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,d579b07f2c02fda11798651914d0efb57086d41ce43b75dafb3f9966fdca742b,Tests_failed,fc07236b28fd479621a6f69d4ee7dc08cf3dff11096314bfb97601c909094c0f,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,0.03994560241699219,0.04597592353820801,0.035974979400634766,0.014765262603759766,0.03873300552368164,0.03251242637634277,0.039237022399902344,0.16608262062072754,0.10605573654174805,0.6003727912902832,0.3472268581390381,0.038498878479003906,0.040521860122680664,0.039327383041381836,0.04061388969421387,0.0523066520690918,0.04059958457946777,0.05239582061767578,0.04109811782836914,0.051583290100097656,0.04448413848876953,0.04369926452636719,0.04042625427246094,0.07700681686401367,0.08074283599853516,0.6849713325500488,0.41205549240112305,0.04018759727478027,0.04033017158508301,0.04149580001831055,0.04081916809082031,0.05239677429199219 diff --git a/results/combined/merges_timed/graphaware/neo4j-noderank.csv b/results/combined/merges_timed/graphaware/neo4j-noderank.csv index 2a277727bb..2042577f39 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,True,13,34,289,3,True,13,Tests_passed,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,True,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,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,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Tests_failed,e6e4833c9cb895916b90b152dabfe992e39d6d10805fb7bb6ae788b4a21d4aa5,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,a0b9f5da71514c27af2fc45d2d6d4293dedede46df74097d7e773970687af19b,Tests_failed,b610d91a8634ecc64099f7dae18e0b1c1a371e856d26e65f0df0a2569a6f5ac4,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,0.03881120681762695,0.010079145431518555,0.0406341552734375,0.015003681182861328,0.04344344139099121,0.0417025089263916,0.03421664237976074,0.2324082851409912,0.16808867454528809,0.6346402168273926,0.4796874523162842,0.048735618591308594,0.0731513500213623,0.041269540786743164,0.07471585273742676,0.07280397415161133 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,True,13,34,289,3,True,13,Tests_passed,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,True,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,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,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Tests_failed,e6e4833c9cb895916b90b152dabfe992e39d6d10805fb7bb6ae788b4a21d4aa5,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,a0b9f5da71514c27af2fc45d2d6d4293dedede46df74097d7e773970687af19b,Tests_failed,b610d91a8634ecc64099f7dae18e0b1c1a371e856d26e65f0df0a2569a6f5ac4,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,Tests_passed,73c1044cf844a8bcd18a8601145d6c7ab8865b04ff59c416dcf2b4d87b06a23a,0.03881120681762695,0.010079145431518555,0.0406341552734375,0.015003681182861328,0.04344344139099121,0.0417025089263916,0.03421664237976074,0.2324082851409912,0.16808867454528809,0.6346402168273926,0.4796874523162842,0.048735618591308594,0.0731513500213623,0.041269540786743164,0.07471585273742676,0.07280397415161133,0.07238340377807617,0.0732581615447998,0.07410955429077148,0.07517075538635254,0.07360196113586426,0.07475471496582031,0.07223773002624512,0.1203768253326416,0.13346076011657715,0.7612893581390381,0.5881938934326172,0.07388424873352051,0.07499027252197266,0.07329797744750977,0.07211852073669434,0.07300448417663574 diff --git a/results/combined/merges_timed/graphity/graphity-client.csv b/results/combined/merges_timed/graphity/graphity-client.csv index 006faf389b..4775f23153 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,True,2,15,138,3,True,3,Tests_passed,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,True,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,True,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,609096401f319af53729556d12df86a7ffa839aa409a7e7188eba9f92f672a7b,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,a7e8a198729131c43f1b60c2f5db7f64a56e04817e9c8664c655808e003671bc,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,06b71dce8f957871228efc3ac84bd50dc38bd24a087268c2f5e47df870b83da4,Tests_failed,0cd1f73e1415f567954396e58ffbbbd3d0060d2a0d9a194a01de3bce624c8aeb,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,0.04575514793395996,0.054825544357299805,0.032572269439697266,0.024416685104370117,0.047010183334350586,0.05107283592224121,0.05192232131958008,0.07908177375793457,0.11442303657531738,0.6508941650390625,0.37574219703674316,0.051367998123168945,0.052756547927856445,0.055017709732055664,0.05651235580444336,0.05850362777709961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,True,2,15,138,3,True,3,Tests_passed,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,True,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,True,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,609096401f319af53729556d12df86a7ffa839aa409a7e7188eba9f92f672a7b,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,a7e8a198729131c43f1b60c2f5db7f64a56e04817e9c8664c655808e003671bc,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,06b71dce8f957871228efc3ac84bd50dc38bd24a087268c2f5e47df870b83da4,Tests_failed,0cd1f73e1415f567954396e58ffbbbd3d0060d2a0d9a194a01de3bce624c8aeb,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,0.04575514793395996,0.054825544357299805,0.032572269439697266,0.024416685104370117,0.047010183334350586,0.05107283592224121,0.05192232131958008,0.07908177375793457,0.11442303657531738,0.6508941650390625,0.37574219703674316,0.051367998123168945,0.052756547927856445,0.055017709732055664,0.05651235580444336,0.05850362777709961,0.057750701904296875,0.05826520919799805,0.05955696105957031,0.059683799743652344,0.06083559989929199,0.059325218200683594,0.0555424690246582,0.0952444076538086,0.10365128517150879,0.7315065860748291,0.49062681198120117,0.06011700630187988,0.06111001968383789,0.05868077278137207,0.05950188636779785,0.04832148551940918 diff --git a/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv b/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv index b98dccffa5..b4f21489b3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,True,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,True,17,80,544,3,True,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,True,17,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,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,398006af34a810bb87c98a806526b483abead786bb13f358c47afe8772ab68a9,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,dbe6ea4225a7834cb361a7c00f015fbc33b6e69f0b6053aba6b32dcff0c5da2b,Tests_failed,098ce2f159ad70d29b9978c0f30279d3e1d138ccb634ec9d84751d66224facf6,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,0.062256574630737305,0.04365801811218262,0.06002449989318848,0.022217988967895508,0.054126739501953125,0.06640267372131348,0.06296443939208984,0.2233598232269287,0.16398215293884277,1.3605239391326904,0.5637493133544922,0.06314659118652344,0.06087541580200195,0.0641016960144043,0.06653285026550293,0.0658714771270752 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,True,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,True,17,80,544,3,True,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,True,17,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,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,398006af34a810bb87c98a806526b483abead786bb13f358c47afe8772ab68a9,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,dbe6ea4225a7834cb361a7c00f015fbc33b6e69f0b6053aba6b32dcff0c5da2b,Tests_failed,098ce2f159ad70d29b9978c0f30279d3e1d138ccb634ec9d84751d66224facf6,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,0.062256574630737305,0.04365801811218262,0.06002449989318848,0.022217988967895508,0.054126739501953125,0.06640267372131348,0.06296443939208984,0.2233598232269287,0.16398215293884277,1.3605239391326904,0.5637493133544922,0.06314659118652344,0.06087541580200195,0.0641016960144043,0.06653285026550293,0.0658714771270752,0.06560707092285156,0.06441950798034668,0.06656575202941895,0.06791996955871582,0.06842374801635742,0.06569814682006836,0.06870388984680176,0.11812138557434082,0.13023996353149414,1.5338988304138184,0.67645263671875,0.06539011001586914,0.06475687026977539,0.06561493873596191,0.06691837310791016,0.06702351570129395 diff --git a/results/combined/merges_timed/greenlaw110/rythm.csv b/results/combined/merges_timed/greenlaw110/rythm.csv index bf39cc3542..78e02ff9ea 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,Tests_passed,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,True,15,149,783,2,True,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,True,15,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,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,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,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,fee888f21fe2be4023f806aa7593cbca4f8f5a614f0bd6de8124d241cfc1d056,Tests_failed,3bda662343cf3bf43cf41b3326fa9cd715c3915a118625c3ac4d0820d5831c1e,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,0.021421194076538086,0.021729230880737305,0.02681565284729004,0.03285551071166992,0.0263979434967041,0.02720355987548828,0.02721881866455078,0.04649829864501953,0.07649898529052734,0.6062009334564209,0.9306957721710205,0.0663902759552002,0.06448531150817871,0.04125404357910156,0.06399178504943848,0.06367254257202148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,Tests_passed,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,True,15,149,783,2,True,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,True,15,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,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,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,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,fee888f21fe2be4023f806aa7593cbca4f8f5a614f0bd6de8124d241cfc1d056,Tests_failed,3bda662343cf3bf43cf41b3326fa9cd715c3915a118625c3ac4d0820d5831c1e,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,0.021421194076538086,0.021729230880737305,0.02681565284729004,0.03285551071166992,0.0263979434967041,0.02720355987548828,0.02721881866455078,0.04649829864501953,0.07649898529052734,0.6062009334564209,0.9306957721710205,0.0663902759552002,0.06448531150817871,0.04125404357910156,0.06399178504943848,0.06367254257202148,0.0609593391418457,0.058565616607666016,0.06248021125793457,0.060431480407714844,0.06179952621459961,0.06240439414978027,0.08685088157653809,0.1202847957611084,0.09349608421325684,0.6916694641113281,1.022162675857544,0.062047481536865234,0.06070113182067871,0.061354637145996094,0.060445547103881836,0.06092333793640137 diff --git a/results/combined/merges_timed/greenmail-mail-test/greenmail.csv b/results/combined/merges_timed/greenmail-mail-test/greenmail.csv index 86d6cbf95f..54c16c51f1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,True,33,79,507,4,True,35,Tests_passed,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,True,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,True,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,fcf3902c1881a2fbaabbb9ea6aafbc391dada549566c98750e95a21ee4d81031,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,4ace8eebcbc4fe064ebd2af69786f277a5715b574d3772dfab67483a8adbb35d,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,0.020759105682373047,0.012636423110961914,0.023023605346679688,0.020420312881469727,0.02302718162536621,0.023311614990234375,0.022675514221191406,0.05486464500427246,0.07707500457763672,0.6110186576843262,-1.0,0.06173300743103027,0.04829764366149902,0.06479501724243164,0.047191619873046875,0.062361717224121094 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,True,33,79,507,4,True,35,Tests_passed,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,True,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,True,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,fcf3902c1881a2fbaabbb9ea6aafbc391dada549566c98750e95a21ee4d81031,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,4ace8eebcbc4fe064ebd2af69786f277a5715b574d3772dfab67483a8adbb35d,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,0.020759105682373047,0.012636423110961914,0.023023605346679688,0.020420312881469727,0.02302718162536621,0.023311614990234375,0.022675514221191406,0.05486464500427246,0.07707500457763672,0.6110186576843262,-1.0,0.06173300743103027,0.04829764366149902,0.06479501724243164,0.047191619873046875,0.062361717224121094,0.06103634834289551,0.049123287200927734,0.06284809112548828,0.06506466865539551,0.051065683364868164,0.06870365142822266,0.04939460754394531,0.10393953323364258,0.10381007194519043,0.7606172561645508,-1.0,0.05398249626159668,0.06221437454223633,0.049102067947387695,0.06190919876098633,0.04841899871826172 diff --git a/results/combined/merges_timed/greese/dasein-cloud-core.csv b/results/combined/merges_timed/greese/dasein-cloud-core.csv index 661430a7bd..bc51a294dc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -219,refs/heads/master,841d623662ccc6ce6d67310f65a26c751ae02e0e,5290164d76259e90ccc744a4a51d7492a5ea2eb9,3be7127c3dd09899fa0a9f5058a8787245611f81,,True,True,Tests_passed,483a04f4ddb6cce3ab81233802959831f7890b7a483ff16e01f6441f8e5ec2f4,True,12,42,406,2,True,Tests_passed,7b3b7846b4ca1c82110f60d262f6a951adb29456a1009bd063d9c7306a53408a,True,12,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,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_failed,9306f6a29d92e68a28a94ef8ce13961017fa62a102e2042e891a0b91e38008a1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,0649d8f3587c81c0d07ec926bccd50549936d770cd48feca634a4249ab9cf401,Tests_failed,9306f6a29d92e68a28a94ef8ce13961017fa62a102e2042e891a0b91e38008a1,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,0.012648344039916992,0.04090523719787598,0.04495859146118164,0.03362751007080078,0.02680802345275879,0.03631281852722168,0.026134729385375977,0.12583494186401367,0.07440733909606934,1.2853891849517822,0.4735300540924072,0.07248306274414062,0.09956717491149902,0.03607940673828125,0.06699943542480469,0.08817100524902344 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +219,refs/heads/master,841d623662ccc6ce6d67310f65a26c751ae02e0e,5290164d76259e90ccc744a4a51d7492a5ea2eb9,3be7127c3dd09899fa0a9f5058a8787245611f81,,True,True,Tests_passed,483a04f4ddb6cce3ab81233802959831f7890b7a483ff16e01f6441f8e5ec2f4,True,12,42,406,2,True,Tests_passed,7b3b7846b4ca1c82110f60d262f6a951adb29456a1009bd063d9c7306a53408a,True,12,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,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_failed,9306f6a29d92e68a28a94ef8ce13961017fa62a102e2042e891a0b91e38008a1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,0649d8f3587c81c0d07ec926bccd50549936d770cd48feca634a4249ab9cf401,Tests_failed,9306f6a29d92e68a28a94ef8ce13961017fa62a102e2042e891a0b91e38008a1,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,5cf8447fdb24eae87c4f3ccbff5299fa90f7bf2e31266fe9b89565a9a1f1cb51,Tests_passed,a77a17b494f9fabbfe1c232d87927101ae35853b3a73ae7063030f6a063fa665,0.012648344039916992,0.04090523719787598,0.04495859146118164,0.03362751007080078,0.02680802345275879,0.03631281852722168,0.026134729385375977,0.12583494186401367,0.07440733909606934,1.2853891849517822,0.4735300540924072,0.07248306274414062,0.09956717491149902,0.03607940673828125,0.06699943542480469,0.08817100524902344,0.06178903579711914,0.06609988212585449,0.10113310813903809,0.10464954376220703,0.06426382064819336,0.06419920921325684,0.09729290008544922,0.14632320404052734,0.13897180557250977,1.2542927265167236,0.5033092498779297,0.07212710380554199,0.0974884033203125,0.09843969345092773,0.06393957138061523,0.06467723846435547 diff --git a/results/combined/merges_timed/gridgain/yardstick.csv b/results/combined/merges_timed/gridgain/yardstick.csv index 140b5cb16e..880e9b4b60 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,True,7,9,539,2,True,7,Tests_passed,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,True,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,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,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,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,80f09dc45be19905cd00c39fd7d87d206b39749158b921299f0dfceceba433d7,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,0.043456077575683594,0.0452883243560791,0.05102872848510742,0.01837635040283203,0.04447031021118164,0.05230855941772461,0.05262422561645508,0.15249204635620117,0.10938072204589844,0.7755532264709473,0.3002188205718994,0.03400015830993652,0.05861401557922363,0.03371691703796387,0.057189226150512695,0.05843639373779297 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,True,7,9,539,2,True,7,Tests_passed,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,True,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,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,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,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,80f09dc45be19905cd00c39fd7d87d206b39749158b921299f0dfceceba433d7,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,0.043456077575683594,0.0452883243560791,0.05102872848510742,0.01837635040283203,0.04447031021118164,0.05230855941772461,0.05262422561645508,0.15249204635620117,0.10938072204589844,0.7755532264709473,0.3002188205718994,0.03400015830993652,0.05861401557922363,0.03371691703796387,0.057189226150512695,0.05843639373779297,0.05917215347290039,0.0607450008392334,0.05972933769226074,0.06022763252258301,0.05980038642883301,0.06002998352050781,0.059068918228149414,0.09563994407653809,0.0907278060913086,0.9857206344604492,0.36098551750183105,0.05816531181335449,0.05821967124938965,0.05782365798950195,0.059136390686035156,0.05999422073364258 diff --git a/results/combined/merges_timed/grove/presto.csv b/results/combined/merges_timed/grove/presto.csv index 4bd339c136..14da4adf77 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,True,13,72,531,2,True,13,Tests_passed,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,True,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,True,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,4df4b7068192a1f70a43fada3ea08714c75db3a0e7cb553f8ab7695e3ed9a485,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Tests_failed,0700a67a9ab05a621025a0dc2b31ecb1686d80b344d5f83ddacb40e862411e17,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,20a67b86aeb684e4a7695feeb6e195ff39d8b66b486f933ae277647b25255455,Merge_failed,551b4c8e8752b3bfb39e0beec3a008e7fa793fa1916aac403a968c1fb8a95a0b,Tests_passed,bcd2ae4e66998623ab17f7a26c80592be3b2d22b19050add10a0665d1a8ea428,Tests_failed,f35fc4d26c3cd2767125a3d79d12ffc135bf575d91618c4b3ec2aa95c266ac53,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,0.040767669677734375,0.0500178337097168,0.05116987228393555,0.018354177474975586,0.061208248138427734,0.043459415435791016,0.04870963096618652,0.1896038055419922,0.13439011573791504,1.3830535411834717,1.1689856052398682,0.047028541564941406,0.04759621620178223,0.04674100875854492,0.05000782012939453,0.05052328109741211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,True,13,72,531,2,True,13,Tests_passed,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,True,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,True,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,4df4b7068192a1f70a43fada3ea08714c75db3a0e7cb553f8ab7695e3ed9a485,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Tests_failed,0700a67a9ab05a621025a0dc2b31ecb1686d80b344d5f83ddacb40e862411e17,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,20a67b86aeb684e4a7695feeb6e195ff39d8b66b486f933ae277647b25255455,Merge_failed,551b4c8e8752b3bfb39e0beec3a008e7fa793fa1916aac403a968c1fb8a95a0b,Tests_passed,bcd2ae4e66998623ab17f7a26c80592be3b2d22b19050add10a0665d1a8ea428,Tests_failed,f35fc4d26c3cd2767125a3d79d12ffc135bf575d91618c4b3ec2aa95c266ac53,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,954693eb4ac3a9d27194e50bcdfd198addb086394e178f1f8da40719dabe522f,Merge_failed,64b38a5fd04568d1c2c2a49052bc4606388136a2d8b5840e1a881027f637f211,0.040767669677734375,0.0500178337097168,0.05116987228393555,0.018354177474975586,0.061208248138427734,0.043459415435791016,0.04870963096618652,0.1896038055419922,0.13439011573791504,1.3830535411834717,1.1689856052398682,0.047028541564941406,0.04759621620178223,0.04674100875854492,0.05000782012939453,0.05052328109741211,0.04724597930908203,0.04734492301940918,0.048406124114990234,0.047252655029296875,0.04894423484802246,0.05023980140686035,0.04763197898864746,0.0819404125213623,0.10073328018188477,1.3690593242645264,1.3133914470672607,0.04828023910522461,0.0455632209777832,0.04891204833984375,0.05024528503417969,0.0491635799407959 diff --git a/results/combined/merges_timed/grundid/nfctools.csv b/results/combined/merges_timed/grundid/nfctools.csv index 44e396ed11..75edbb7639 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,True,True,Tests_passed,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,True,114.0,215,4751.0,2,True,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,True,118,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,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_timedout,,Merge_failed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Merge_failed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,c1f592ebdd25234d7fe2fd5a39f80c4e82c3784e9ef65e2297be8422f0d454b1,Merge_timedout,,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,0.060439109802246094,0.05879688262939453,0.05813765525817871,0.02546381950378418,0.060800790786743164,0.05149078369140625,0.053951263427734375,0.17128372192382812,0.13067150115966797,0.4301767349243164,-1.0,0.050039052963256836,0.06757879257202148,0.05008530616760254,0.06802701950073242,0.06928372383117676 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,True,True,Tests_passed,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,True,114.0,215,4751.0,2,True,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,True,118,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,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_timedout,,Merge_failed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Merge_failed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,c1f592ebdd25234d7fe2fd5a39f80c4e82c3784e9ef65e2297be8422f0d454b1,Merge_timedout,,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,Tests_passed,568c406272674272e73cd0382a62b0869e7b445520034ae6736e9f0d9dcc0c12,0.060439109802246094,0.05879688262939453,0.05813765525817871,0.02546381950378418,0.060800790786743164,0.05149078369140625,0.053951263427734375,0.17128372192382812,0.13067150115966797,0.4301767349243164,-1.0,0.050039052963256836,0.06757879257202148,0.05008530616760254,0.06802701950073242,0.06928372383117676,0.0659019947052002,0.06745219230651855,0.0659019947052002,0.07089662551879883,0.06650376319885254,0.06543278694152832,0.0690910816192627,0.09811592102050781,0.0991208553314209,0.47458600997924805,-1.0,0.06584668159484863,0.06524491310119629,0.0639944076538086,0.06485509872436523,0.0672919750213623 diff --git a/results/combined/merges_timed/grunka/fortuna.csv b/results/combined/merges_timed/grunka/fortuna.csv index d346879824..48943a7761 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,True,42,104,906,3,True,43,Tests_passed,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,True,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,True,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,f2df0ca146491222660e970cdddab1b331f846ef2305778b3ae75f2f6c86df9b,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,a48cd0f09d10e2419ecd0c848f5cae614d7e3bcf6a74d8b8da8c1fc8995f8554,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,0.04694247245788574,0.04844260215759277,0.05316162109375,0.01726055145263672,0.056101322174072266,0.022815942764282227,0.05246567726135254,0.24225831031799316,0.18371152877807617,0.5730974674224854,0.5252881050109863,0.0490260124206543,0.047068119049072266,0.04812765121459961,0.04871845245361328,0.04836249351501465 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,True,42,104,906,3,True,43,Tests_passed,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,True,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,True,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,f2df0ca146491222660e970cdddab1b331f846ef2305778b3ae75f2f6c86df9b,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,a48cd0f09d10e2419ecd0c848f5cae614d7e3bcf6a74d8b8da8c1fc8995f8554,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,0.04694247245788574,0.04844260215759277,0.05316162109375,0.01726055145263672,0.056101322174072266,0.022815942764282227,0.05246567726135254,0.24225831031799316,0.18371152877807617,0.5730974674224854,0.5252881050109863,0.0490260124206543,0.047068119049072266,0.04812765121459961,0.04871845245361328,0.04836249351501465,0.04620933532714844,0.045454978942871094,0.04859328269958496,0.048508644104003906,0.04836416244506836,0.04922986030578613,0.04858565330505371,0.09554386138916016,0.10712075233459473,0.6198909282684326,0.5825567245483398,0.04522848129272461,0.046900272369384766,0.046445369720458984,0.045339345932006836,0.046886444091796875 diff --git a/results/combined/merges_timed/guhilling/cdi-test.csv b/results/combined/merges_timed/guhilling/cdi-test.csv index 5d2ae73359..988e88e947 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,True,133,195,807,42,True,140,Tests_passed,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,True,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,True,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,d4b079d43144dd60f225f9326bb298255014464810c2073606bc51365d4457ac,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,Merge_failed,701ef82bbf1c96214b1260032b197604cfed551495c9b308013b7ad1a483ca91,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,04fe27866e9e35e9d6c28c7bc69d881864ae5221e3921eed9f4bce07ceec702d,Merge_failed,c6bbe3052e7fbec86edb9c4abc344fa8ef0e870ff347d950863fc240aad632f8,Merge_failed,f137ec4529012df33b3cf4f021f89ce9e6c4b8b67e9c702c375c35141ce8677b,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,0.06470561027526855,0.062088727951049805,0.06378483772277832,0.02715301513671875,0.07671999931335449,0.05745887756347656,0.05684351921081543,2.241236925125122,1.9729368686676025,10.513340473175049,0.8463308811187744,0.22721195220947266,0.5239107608795166,0.22259831428527832,0.5283114910125732,0.5206143856048584 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,True,133,195,807,42,True,140,Tests_passed,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,True,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,True,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,d4b079d43144dd60f225f9326bb298255014464810c2073606bc51365d4457ac,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,Merge_failed,701ef82bbf1c96214b1260032b197604cfed551495c9b308013b7ad1a483ca91,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,a1675787e9a48cc15a2e5e8f2098c7aa1f4769e04d8505c1a62519ae4130d6b2,Merge_failed,04fe27866e9e35e9d6c28c7bc69d881864ae5221e3921eed9f4bce07ceec702d,Merge_failed,c6bbe3052e7fbec86edb9c4abc344fa8ef0e870ff347d950863fc240aad632f8,Merge_failed,f137ec4529012df33b3cf4f021f89ce9e6c4b8b67e9c702c375c35141ce8677b,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,Merge_failed,6c3516ac91f262f19900fd230fb82e1c361a8c558a11fa4ae8189c87ee3d58bd,0.06470561027526855,0.062088727951049805,0.06378483772277832,0.02715301513671875,0.07671999931335449,0.05745887756347656,0.05684351921081543,2.241236925125122,1.9729368686676025,10.513340473175049,0.8463308811187744,0.22721195220947266,0.5239107608795166,0.22259831428527832,0.5283114910125732,0.5206143856048584,0.520174503326416,0.5286874771118164,0.5149383544921875,0.5274937152862549,0.5268549919128418,0.5200409889221191,0.538344144821167,1.1092333793640137,1.4194140434265137,12.146425008773804,1.4650404453277588,0.5220601558685303,0.5246915817260742,0.5132272243499756,0.5188102722167969,0.5279924869537354 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 ac7bb2b77e..2db59bfdec 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,True,177,522,3657.0,4,True,177,Tests_passed,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,True,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,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,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,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,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,1142becf2b6a7b66350ef4504944e6cb6f72e54457091ea66535df7c44903397,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,0.06538867950439453,0.06130099296569824,0.05102229118347168,0.03718996047973633,0.05623626708984375,0.061049461364746094,0.06355857849121094,0.3112502098083496,0.22670650482177734,2.2529942989349365,1.894561529159546,0.05916190147399902,0.12824273109436035,0.059247732162475586,0.1294090747833252,0.12899136543273926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,True,177,522,3657.0,4,True,177,Tests_passed,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,True,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,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,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,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,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,1142becf2b6a7b66350ef4504944e6cb6f72e54457091ea66535df7c44903397,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,0.06538867950439453,0.06130099296569824,0.05102229118347168,0.03718996047973633,0.05623626708984375,0.061049461364746094,0.06355857849121094,0.3112502098083496,0.22670650482177734,2.2529942989349365,1.894561529159546,0.05916190147399902,0.12824273109436035,0.059247732162475586,0.1294090747833252,0.12899136543273926,0.12502765655517578,0.1180422306060791,0.13113903999328613,0.12476801872253418,0.12662720680236816,0.1244974136352539,0.12659740447998047,0.20427489280700684,0.20656037330627441,2.25703763961792,1.94669771194458,0.12139129638671875,0.11658239364624023,0.125809907913208,0.11862850189208984,0.1217958927154541 diff --git a/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv b/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv index 5c6d147109..7c61d4b03d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -273,refs/heads/master,4fc9137691f262d79c1f7844d85659dea906122c,2bf9681565c5afb56975302f7b43f0b1047bb7df,d88b69006707290f80fc2b2015248303168a9c22,,True,True,True,169,574,2953,51,True,174,Tests_passed,b7b26bc5205b94a2a0e2a37bb032595181f027649c9ce9b15cf7fb5eab498f8c,True,Tests_passed,8a7a2318b73299229541277f9b490ae8d01aef524eb3dfe5f6f6ceaf50fb2a7e,True,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,0aee480b98d6206990424557f1cf91a093bea7b63765e02ab8352b7870a15397,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,81a37314ffca041287d562de763ebef70b878c328d2e9e47fed760750ea1fe48,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,629ce5fa81bdc50fee15811c37e9f0028e74516aaa16af4c1123f3503d1f0ca1,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,95fb3f2d279be0522f7ffbb3b996f1243adc38842592ac0322010543083e05a3,Merge_failed,9b3986e84836679ae9255432aff53ce715596f02135397f470a0a8e62a5b1751,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,56e8373b6a7157c47a19364bc224da65351f5dccd42f80467f5c53b6bd9606f3,Merge_failed,df398591f24802f9b679e4b921b266f6b98dcad21b01da335e9d2036541d0367,Merge_failed,df398591f24802f9b679e4b921b266f6b98dcad21b01da335e9d2036541d0367,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,7be6db4dd7ef6da258cd7157778ff3fdcfe53a41cab8aa29a6b97eb98892aa05,Merge_failed,8586e895582649947f7fdb597b3ab977050e48360555faa4c69e65286ce9fe8d,Merge_failed,0b0939a996c65b48e4952f43fb8a686cfa7c6bde1c5bb08417aa1db99b442f02,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,0.03880167007446289,0.059484243392944336,0.06165170669555664,0.030411481857299805,0.061612844467163086,0.07290172576904297,0.04823184013366699,2.9213786125183105,2.663084030151367,19.77274489402771,1.016146183013916,0.10266757011413574,0.924302339553833,0.09877991676330566,0.921515941619873,0.937798023223877 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +273,refs/heads/master,4fc9137691f262d79c1f7844d85659dea906122c,2bf9681565c5afb56975302f7b43f0b1047bb7df,d88b69006707290f80fc2b2015248303168a9c22,,True,True,True,169,574,2953,51,True,174,Tests_passed,b7b26bc5205b94a2a0e2a37bb032595181f027649c9ce9b15cf7fb5eab498f8c,True,Tests_passed,8a7a2318b73299229541277f9b490ae8d01aef524eb3dfe5f6f6ceaf50fb2a7e,True,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,0aee480b98d6206990424557f1cf91a093bea7b63765e02ab8352b7870a15397,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,81a37314ffca041287d562de763ebef70b878c328d2e9e47fed760750ea1fe48,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,629ce5fa81bdc50fee15811c37e9f0028e74516aaa16af4c1123f3503d1f0ca1,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,95fb3f2d279be0522f7ffbb3b996f1243adc38842592ac0322010543083e05a3,Merge_failed,9b3986e84836679ae9255432aff53ce715596f02135397f470a0a8e62a5b1751,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,56e8373b6a7157c47a19364bc224da65351f5dccd42f80467f5c53b6bd9606f3,Merge_failed,df398591f24802f9b679e4b921b266f6b98dcad21b01da335e9d2036541d0367,Merge_failed,df398591f24802f9b679e4b921b266f6b98dcad21b01da335e9d2036541d0367,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,7be6db4dd7ef6da258cd7157778ff3fdcfe53a41cab8aa29a6b97eb98892aa05,Merge_failed,8586e895582649947f7fdb597b3ab977050e48360555faa4c69e65286ce9fe8d,Merge_failed,0b0939a996c65b48e4952f43fb8a686cfa7c6bde1c5bb08417aa1db99b442f02,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,b38ea45c2b50759b698dcb8e83239a978c32681bd9a62ec6b054d60412f883e7,Merge_failed,d1ce9a7ea082c5775a3532df4b1a1873fcf6cfc24c31522a433187f19859dc34,0.03880167007446289,0.059484243392944336,0.06165170669555664,0.030411481857299805,0.061612844467163086,0.07290172576904297,0.04823184013366699,2.9213786125183105,2.663084030151367,19.77274489402771,1.016146183013916,0.10266757011413574,0.924302339553833,0.09877991676330566,0.921515941619873,0.937798023223877,0.9519791603088379,0.9598300457000732,0.9541864395141602,0.9681401252746582,0.9491689205169678,0.9364557266235352,0.9593620300292969,1.766035556793213,2.1067686080932617,23.12478470802307,1.9825220108032227,0.9472620487213135,0.9481980800628662,0.940969705581665,0.9411966800689697,0.9772205352783203 diff --git a/results/combined/merges_timed/hansolo/steelseries-swing.csv b/results/combined/merges_timed/hansolo/steelseries-swing.csv index 984ff08b2b..cd1fa1c49c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,True,True,Tests_passed,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,True,31,244,576,3,True,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,True,31,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_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,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_passed,e4dfe999d115b5e04ff85c05359145723c16dcbdaa3a4434eeee9039af424348,Tests_failed,4f62f45e931d2a3a2cac34fbcc272bc5dafcd17520d125411dd2733576e703cc,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,0.0373377799987793,0.0379788875579834,0.06439423561096191,0.032979488372802734,0.032700300216674805,0.059618473052978516,0.0752251148223877,0.28786468505859375,0.16938161849975586,4.507865905761719,1.7933149337768555,0.08025789260864258,0.12906622886657715,0.0749509334564209,0.14134621620178223,0.14692091941833496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,True,True,Tests_passed,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,True,31,244,576,3,True,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,True,31,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_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,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_passed,e4dfe999d115b5e04ff85c05359145723c16dcbdaa3a4434eeee9039af424348,Tests_failed,4f62f45e931d2a3a2cac34fbcc272bc5dafcd17520d125411dd2733576e703cc,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,0.0373377799987793,0.0379788875579834,0.06439423561096191,0.032979488372802734,0.032700300216674805,0.059618473052978516,0.0752251148223877,0.28786468505859375,0.16938161849975586,4.507865905761719,1.7933149337768555,0.08025789260864258,0.12906622886657715,0.0749509334564209,0.14134621620178223,0.14692091941833496,0.13541078567504883,0.13792896270751953,0.15117239952087402,0.15265750885009766,0.1492478847503662,0.13518977165222168,0.13417410850524902,0.18707942962646484,0.211350679397583,4.434305191040039,1.8897550106048584,0.12069320678710938,0.13580608367919922,0.13947272300720215,0.1395413875579834,0.13819432258605957 diff --git a/results/combined/merges_timed/haraldwalker/user-agent-utils.csv b/results/combined/merges_timed/haraldwalker/user-agent-utils.csv index 15d5a8300e..92cec48313 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,True,12,46,528.0,2,True,12,Tests_passed,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,True,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,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,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,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,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,9a32dd0fb870865cbdf60e4c7c3479588256b5ac8f37540ab95ab4e469e5ecd4,Tests_failed,1680326c23d0c847bd825796ad7e9e707bb5770037a377b2d4d2f2c074798b06,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,0.040015220642089844,0.04243612289428711,0.04230499267578125,0.02326798439025879,0.05065631866455078,0.04614138603210449,0.059865713119506836,0.177534818649292,0.11368346214294434,2.816448926925659,0.6438283920288086,0.04956555366516113,0.07584929466247559,0.04571962356567383,0.07747030258178711,0.07784175872802734 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,True,12,46,528.0,2,True,12,Tests_passed,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,True,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,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,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,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,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,9a32dd0fb870865cbdf60e4c7c3479588256b5ac8f37540ab95ab4e469e5ecd4,Tests_failed,1680326c23d0c847bd825796ad7e9e707bb5770037a377b2d4d2f2c074798b06,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,0.040015220642089844,0.04243612289428711,0.04230499267578125,0.02326798439025879,0.05065631866455078,0.04614138603210449,0.059865713119506836,0.177534818649292,0.11368346214294434,2.816448926925659,0.6438283920288086,0.04956555366516113,0.07584929466247559,0.04571962356567383,0.07747030258178711,0.07784175872802734,0.07512331008911133,0.07499003410339355,0.07844996452331543,0.07980847358703613,0.08026599884033203,0.07613539695739746,0.07854795455932617,0.11377191543579102,0.10862255096435547,2.6947946548461914,0.6681499481201172,0.07587838172912598,0.07316040992736816,0.07597041130065918,0.07315850257873535,0.07532501220703125 diff --git a/results/combined/merges_timed/hdiv/hdiv.csv b/results/combined/merges_timed/hdiv/hdiv.csv index 5372d90205..7d142bbad3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,True,True,Tests_passed,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,True,22,43,191.0,40,True,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,True,50,True,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,395e9c222363a8b766325192303c6748463916af1004353f0c36ad014ff00b81,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_timedout,,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,96cab8c1970bbc260e679da5e8dc3ab9e8d03e4c4e31eafdf4c7631063bd36f5,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,795505407e640377a2657707a80cbf9bd8debed66a5fe2fc159bf1e6b6345a0c,Merge_timedout,,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,0.022853374481201172,0.0572504997253418,0.06012773513793945,0.021388769149780273,0.05400538444519043,0.04455971717834473,0.05291891098022461,0.8184812068939209,0.7011914253234863,1.4335262775421143,-1.0,0.1525096893310547,0.15902972221374512,0.15442109107971191,0.1570885181427002,0.15836024284362793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,True,True,Tests_passed,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,True,22,43,191.0,40,True,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,True,50,True,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,395e9c222363a8b766325192303c6748463916af1004353f0c36ad014ff00b81,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_timedout,,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,96cab8c1970bbc260e679da5e8dc3ab9e8d03e4c4e31eafdf4c7631063bd36f5,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,795505407e640377a2657707a80cbf9bd8debed66a5fe2fc159bf1e6b6345a0c,Merge_timedout,,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,0.022853374481201172,0.0572504997253418,0.06012773513793945,0.021388769149780273,0.05400538444519043,0.04455971717834473,0.05291891098022461,0.8184812068939209,0.7011914253234863,1.4335262775421143,-1.0,0.1525096893310547,0.15902972221374512,0.15442109107971191,0.1570885181427002,0.15836024284362793,0.15428709983825684,0.1519317626953125,0.15413355827331543,0.1517188549041748,0.14935755729675293,0.1525108814239502,0.14864659309387207,0.3459043502807617,0.4406590461730957,1.5606915950775146,-1.0,0.1559605598449707,0.14991116523742676,0.14866924285888672,0.150726318359375,0.15123510360717773 diff --git a/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv b/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv index d5c8714875..8b3c548c1b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,True,184,520,15210,2,True,184,Tests_passed,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,True,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,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,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_failed,7634ad98d27076cd05ef04e6e98bbbce652e82eb12c3202bba4a34f5bc145454,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c2615296e0ae5aff2934bebbac098f29f3de95b1f19a3e192f416d1a6c2b52ff,Tests_failed,0e60b3e3da5012dc7e4accf088e397a1d009e4a35bf3b87ec12a505b00cf909e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.032355546951293945,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.08771491050720215,0.6546108722686768,1.484583854675293,0.07956552505493164,0.11388111114501953,0.07976341247558594,0.11029648780822754,0.11017227172851562 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,True,184,520,15210,2,True,184,Tests_passed,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,True,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,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,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_failed,7634ad98d27076cd05ef04e6e98bbbce652e82eb12c3202bba4a34f5bc145454,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c2615296e0ae5aff2934bebbac098f29f3de95b1f19a3e192f416d1a6c2b52ff,Tests_failed,0e60b3e3da5012dc7e4accf088e397a1d009e4a35bf3b87ec12a505b00cf909e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.032355546951293945,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.08771491050720215,0.6546108722686768,1.484583854675293,0.07956552505493164,0.11388111114501953,0.07976341247558594,0.11029648780822754,0.11017227172851562,0.08156800270080566,0.11569023132324219,0.13382267951965332,0.12248635292053223,0.12912869453430176,0.1207127571105957,0.10739493370056152,0.14935588836669922,0.1299748420715332,0.8193490505218506,1.50215744972229,0.10703206062316895,0.09378218650817871,0.11024141311645508,0.10915160179138184,0.07764768600463867 diff --git a/results/combined/merges_timed/helpscout/helpscout-api-java.csv b/results/combined/merges_timed/helpscout/helpscout-api-java.csv index 1fda09e074..4e9e24ff04 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,True,45,168,3089,7,True,45,Tests_passed,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,True,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,True,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,45fc83145ad2e907d40aa629e7c1202e987a6152850994d826a81a42132cf8f6,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,Merge_failed,016bc688d4773fc396c8dac42d656b25012c1592b2f1e736c388518d84963945,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,9a057a9330012ba19f3688514e41a44ce0705f3079a10c6c5019a4218796bf8b,Merge_failed,72daa2f035ad0e86e18535a638e1914b7934ef4aae51f08ec21b98f7b43206c5,Merge_failed,72daa2f035ad0e86e18535a638e1914b7934ef4aae51f08ec21b98f7b43206c5,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,7ad1e389eeb077ffd0522e4b3bd557031d6b71d340faeb64098d7440d4e99d62,Merge_failed,6443689f3914ceb5ee604514db0bb8b9b5b4616f0e1ccb2c59125ee3e3474e4a,Merge_failed,ec4b6d6a04a7b8241d15ca034bd8f9b97534ca57c16bd0d00be16cd7a77b2d96,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,0.04920697212219238,0.04857969284057617,0.015218496322631836,0.01796698570251465,0.020058631896972656,0.042943477630615234,0.038201332092285156,0.4205927848815918,0.4021458625793457,2.563270330429077,0.6437451839447021,0.09873747825622559,0.09783244132995605,0.0982656478881836,0.10623359680175781,0.10306930541992188 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,True,45,168,3089,7,True,45,Tests_passed,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,True,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,True,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,45fc83145ad2e907d40aa629e7c1202e987a6152850994d826a81a42132cf8f6,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,Merge_failed,016bc688d4773fc396c8dac42d656b25012c1592b2f1e736c388518d84963945,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,9a057a9330012ba19f3688514e41a44ce0705f3079a10c6c5019a4218796bf8b,Merge_failed,72daa2f035ad0e86e18535a638e1914b7934ef4aae51f08ec21b98f7b43206c5,Merge_failed,72daa2f035ad0e86e18535a638e1914b7934ef4aae51f08ec21b98f7b43206c5,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,7ad1e389eeb077ffd0522e4b3bd557031d6b71d340faeb64098d7440d4e99d62,Merge_failed,6443689f3914ceb5ee604514db0bb8b9b5b4616f0e1ccb2c59125ee3e3474e4a,Merge_failed,ec4b6d6a04a7b8241d15ca034bd8f9b97534ca57c16bd0d00be16cd7a77b2d96,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,3ccd6edc5929e895cd55370b91326a78c85b5ba227ced326baeba2b40ec0f2de,Merge_failed,ae37da57607b7c4dbc7693c12c2b63309971e3b964def6b494aabf23c5bdafad,0.04920697212219238,0.04857969284057617,0.015218496322631836,0.01796698570251465,0.020058631896972656,0.042943477630615234,0.038201332092285156,0.4205927848815918,0.4021458625793457,2.563270330429077,0.6437451839447021,0.09873747825622559,0.09783244132995605,0.0982656478881836,0.10623359680175781,0.10306930541992188,0.10003781318664551,0.09880924224853516,0.10008478164672852,0.10021281242370605,0.10530233383178711,0.10750889778137207,0.10051822662353516,0.21479105949401855,0.2792236804962158,2.565108299255371,0.7489397525787354,0.1017909049987793,0.10226035118103027,0.10238289833068848,0.09974837303161621,0.09968256950378418 diff --git a/results/combined/merges_timed/helun/ektorp.csv b/results/combined/merges_timed/helun/ektorp.csv index f36cc81a63..a0f8e851a0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,Tests_passed,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,True,13,32,272.0,3,True,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,True,13,True,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,99845334874e4acd9b786eb70980556a20cd26aa4309ee4e699aab74b515908c,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Tests_failed,84bbf3e0431288ab2a613710a82e665c63714e0ecc12a49a2239f64c2eb3f67e,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,3338715ea2397f0957db7a5020686a4517b753bcb9064854fd1d8de1fe92e912,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,e33850a67d29608af6909ca980c50c7dd6aa8bef3ef659ab8b368d554a431371,Tests_failed,f77a0702ef297111c91b794cc355e0d7dc22d77c677ff45a473019ab8a9c3bee,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,0.050550222396850586,0.02741837501525879,0.048993825912475586,0.01726508140563965,0.04401516914367676,0.03695392608642578,0.0450894832611084,0.23557376861572266,0.17823314666748047,2.308220386505127,0.49102258682250977,0.043684959411621094,0.0798649787902832,0.059296369552612305,0.07078385353088379,0.07077622413635254 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,Tests_passed,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,True,13,32,272.0,3,True,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,True,13,True,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,99845334874e4acd9b786eb70980556a20cd26aa4309ee4e699aab74b515908c,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Tests_failed,84bbf3e0431288ab2a613710a82e665c63714e0ecc12a49a2239f64c2eb3f67e,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,3338715ea2397f0957db7a5020686a4517b753bcb9064854fd1d8de1fe92e912,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,e33850a67d29608af6909ca980c50c7dd6aa8bef3ef659ab8b368d554a431371,Tests_failed,f77a0702ef297111c91b794cc355e0d7dc22d77c677ff45a473019ab8a9c3bee,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,0.050550222396850586,0.02741837501525879,0.048993825912475586,0.01726508140563965,0.04401516914367676,0.03695392608642578,0.0450894832611084,0.23557376861572266,0.17823314666748047,2.308220386505127,0.49102258682250977,0.043684959411621094,0.0798649787902832,0.059296369552612305,0.07078385353088379,0.07077622413635254,0.06771135330200195,0.06669807434082031,0.08214735984802246,0.08176231384277344,0.06679534912109375,0.06748652458190918,0.08312797546386719,0.13458681106567383,0.12251162528991699,2.2418627738952637,0.5884373188018799,0.07981538772583008,0.06856369972229004,0.06539416313171387,0.07987070083618164,0.08136177062988281 diff --git a/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv b/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv index 30a485959f..7516544142 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,True,,Tests_passed,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,True,31,41,,2,True,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,True,31,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,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,857b68d6d6e1ae01ce4ac88c5181ff27e69343c61d9d78ed4ebed7f1ae6b3582,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,0.009239435195922852,0.009822845458984375,0.009459972381591797,0.01711273193359375,0.00939798355102539,0.009392499923706055,0.009443044662475586,0.03319907188415527,0.06439757347106934,0.5781552791595459,0.30082154273986816,0.031336307525634766,0.05734562873840332,0.0315096378326416,0.05751156806945801,0.058873891830444336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,True,,Tests_passed,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,True,31,41,,2,True,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,True,31,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,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,857b68d6d6e1ae01ce4ac88c5181ff27e69343c61d9d78ed4ebed7f1ae6b3582,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,d70590add1bece0e101505870c5757fcb578374cd41d77b9f61397f403acec5f,Tests_passed,c485f12776501e91a2797710b205aae5ff5fd56120db02e3b30ff305e14e42a9,0.009239435195922852,0.009822845458984375,0.009459972381591797,0.01711273193359375,0.00939798355102539,0.009392499923706055,0.009443044662475586,0.03319907188415527,0.06439757347106934,0.5781552791595459,0.30082154273986816,0.031336307525634766,0.05734562873840332,0.0315096378326416,0.05751156806945801,0.058873891830444336,0.05583310127258301,0.057791948318481445,0.056873321533203125,0.05785679817199707,0.05591940879821777,0.05617856979370117,0.056394100189208984,0.08817720413208008,0.08728504180908203,0.6654067039489746,0.32863473892211914,0.054747819900512695,0.05530428886413574,0.05576801300048828,0.055429935455322266,0.05689525604248047 diff --git a/results/combined/merges_timed/heroku/heroku-maven-plugin.csv b/results/combined/merges_timed/heroku/heroku-maven-plugin.csv index 2578181480..ff3ea13aac 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,True,16,39,774,2,True,16,Tests_passed,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,True,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,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,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,25952c6d38bd67453bcc35582ffff37911ad567aef7a00ee9e96aff958fa4cf7,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,dd48807de4d95f41eedbd4ecb497aaf0dbda4ec8c33cb162b7a3f01ba64b765b,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,0.040528297424316406,0.04721426963806152,0.04238295555114746,0.017921924591064453,0.03429555892944336,0.04007554054260254,0.03531503677368164,0.13519573211669922,0.11083531379699707,0.4876837730407715,0.2619917392730713,0.040815114974975586,0.04281425476074219,0.04197192192077637,0.042324066162109375,0.05633544921875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,True,16,39,774,2,True,16,Tests_passed,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,True,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,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,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,25952c6d38bd67453bcc35582ffff37911ad567aef7a00ee9e96aff958fa4cf7,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,dd48807de4d95f41eedbd4ecb497aaf0dbda4ec8c33cb162b7a3f01ba64b765b,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,0.040528297424316406,0.04721426963806152,0.04238295555114746,0.017921924591064453,0.03429555892944336,0.04007554054260254,0.03531503677368164,0.13519573211669922,0.11083531379699707,0.4876837730407715,0.2619917392730713,0.040815114974975586,0.04281425476074219,0.04197192192077637,0.042324066162109375,0.05633544921875,0.04335951805114746,0.0561976432800293,0.04328560829162598,0.05679750442504883,0.04264545440673828,0.042791128158569336,0.0435025691986084,0.07618594169616699,0.09318923950195312,0.5489237308502197,0.3404254913330078,0.04260134696960449,0.04232597351074219,0.04250216484069824,0.04322361946105957,0.05634593963623047 diff --git a/results/combined/merges_timed/heroku/java-getting-started.csv b/results/combined/merges_timed/heroku/java-getting-started.csv index ae931fcaad..4e9a8f7d64 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,True,4,7,34.0,3,True,4,Tests_passed,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,True,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,b208f31f33d4982887fb8f8736c568dbab3e29fb2892122bc61620898e3391e2,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,ccb8cafd9f1d7cdd86b764ddaa90f75fd336a3788df6004212e202d67010af4b,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,0.04074239730834961,0.0419766902923584,0.0431210994720459,0.014552831649780273,0.04185891151428223,0.04547476768493652,0.037100791931152344,0.22896122932434082,0.1752490997314453,0.6425867080688477,0.22184228897094727,0.030493974685668945,0.05684256553649902,0.029814481735229492,0.05804944038391113,0.058622121810913086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,True,4,7,34.0,3,True,4,Tests_passed,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,True,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,b208f31f33d4982887fb8f8736c568dbab3e29fb2892122bc61620898e3391e2,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,ccb8cafd9f1d7cdd86b764ddaa90f75fd336a3788df6004212e202d67010af4b,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,0.04074239730834961,0.0419766902923584,0.0431210994720459,0.014552831649780273,0.04185891151428223,0.04547476768493652,0.037100791931152344,0.22896122932434082,0.1752490997314453,0.6425867080688477,0.22184228897094727,0.030493974685668945,0.05684256553649902,0.029814481735229492,0.05804944038391113,0.058622121810913086,0.05698132514953613,0.05937504768371582,0.0589597225189209,0.05902361869812012,0.05968928337097168,0.05820345878601074,0.059969425201416016,0.10231614112854004,0.11510682106018066,0.7138288021087646,0.29194140434265137,0.05779623985290527,0.05829477310180664,0.05743813514709473,0.05801963806152344,0.05882573127746582 diff --git a/results/combined/merges_timed/heronarts/lx.csv b/results/combined/merges_timed/heronarts/lx.csv index b3eef95b4a..9741bbebf9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,Tests_passed,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,True,37,183,1980,3,True,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,True,37,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,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,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,29610a923ac7c6144f4ae8d5aecd0236f432ad12a4490a032ae0f077548aa4d4,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,0.059096574783325195,0.04705357551574707,0.05054640769958496,0.03956937789916992,0.02400493621826172,0.06952977180480957,0.05446457862854004,0.24164867401123047,0.1755070686340332,2.5707600116729736,1.3119072914123535,0.04841446876525879,0.10192227363586426,0.06608843803405762,0.10022759437561035,0.10783171653747559 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,Tests_passed,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,True,37,183,1980,3,True,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,True,37,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,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,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,29610a923ac7c6144f4ae8d5aecd0236f432ad12a4490a032ae0f077548aa4d4,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,0.059096574783325195,0.04705357551574707,0.05054640769958496,0.03956937789916992,0.02400493621826172,0.06952977180480957,0.05446457862854004,0.24164867401123047,0.1755070686340332,2.5707600116729736,1.3119072914123535,0.04841446876525879,0.10192227363586426,0.06608843803405762,0.10022759437561035,0.10783171653747559,0.11955928802490234,0.10127592086791992,0.11382508277893066,0.12862586975097656,0.1001899242401123,0.13102030754089355,0.09923911094665527,0.16989707946777344,0.18828678131103516,3.0219669342041016,1.5314323902130127,0.12041020393371582,0.10109186172485352,0.12085556983947754,0.0983879566192627,0.1255970001220703 diff --git a/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv b/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv index cf2a64d5b0..e048e538cf 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,True,4,13,47,2,True,4,Tests_passed,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,True,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,fe9e3080e241e3fec03c35ac67d4e934f4da72d9e7d768797e6d6787e1537c5c,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,5613eb1d6f7e3f2308a0641dfca555087c48d3c423633027c712e4fdf99604cb,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f4c4aaa56cd794d742f39f5c836a82ad3b966d2aab04f6354a34f50611a80fb5,Tests_failed,1bc18c9e390ff43ffa7c133947795e22e94397964da8e1fe2d1775cb16eb594d,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,0.04495739936828613,0.04348397254943848,0.03450179100036621,0.014372110366821289,0.03551650047302246,0.03693079948425293,0.03876900672912598,0.16919445991516113,0.11597585678100586,0.7277114391326904,0.3586134910583496,0.03984880447387695,0.04163813591003418,0.040194034576416016,0.043279170989990234,0.043276309967041016 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,True,4,13,47,2,True,4,Tests_passed,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,True,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,fe9e3080e241e3fec03c35ac67d4e934f4da72d9e7d768797e6d6787e1537c5c,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,5613eb1d6f7e3f2308a0641dfca555087c48d3c423633027c712e4fdf99604cb,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f4c4aaa56cd794d742f39f5c836a82ad3b966d2aab04f6354a34f50611a80fb5,Tests_failed,1bc18c9e390ff43ffa7c133947795e22e94397964da8e1fe2d1775cb16eb594d,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,0.04495739936828613,0.04348397254943848,0.03450179100036621,0.014372110366821289,0.03551650047302246,0.03693079948425293,0.03876900672912598,0.16919445991516113,0.11597585678100586,0.7277114391326904,0.3586134910583496,0.03984880447387695,0.04163813591003418,0.040194034576416016,0.043279170989990234,0.043276309967041016,0.04307246208190918,0.04233241081237793,0.041153669357299805,0.04304838180541992,0.041934967041015625,0.0417485237121582,0.04277324676513672,0.07447457313537598,0.08296561241149902,0.8150103092193604,0.425853967666626,0.043808698654174805,0.04166078567504883,0.043280601501464844,0.042138099670410156,0.04103541374206543 diff --git a/results/combined/merges_timed/hoijui/javaosc.csv b/results/combined/merges_timed/hoijui/javaosc.csv index 484f79bc34..5813005b7a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,True,18,110,513,6,True,18,Tests_passed,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,True,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,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,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Tests_failed,43c0ef8466b08b1999263cd456fff7102995abdc14ec8310e64fb4cdc5e7f90a,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,0f79de36a1bda8cc5c51b4cfbce6f4b82bb6aa88921f0605985a694bd89a5dc9,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,8069c27a8d320c464a2911ceeb642846c6eb7692b6a5bb0444c58074edefb98d,Tests_failed,069ece2b9679a1b37bab0016d021ea587b6c14fac8e3b82843eb143132d7d8cb,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,0.04349470138549805,0.046640872955322266,0.04426383972167969,0.01573348045349121,0.04656791687011719,0.0401616096496582,0.04564023017883301,0.18687915802001953,0.33893537521362305,2.9797465801239014,0.6300480365753174,0.05348968505859375,0.10891151428222656,0.053529977798461914,0.10829758644104004,0.1102912425994873 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,True,18,110,513,6,True,18,Tests_passed,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,True,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,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,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Tests_failed,43c0ef8466b08b1999263cd456fff7102995abdc14ec8310e64fb4cdc5e7f90a,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,0f79de36a1bda8cc5c51b4cfbce6f4b82bb6aa88921f0605985a694bd89a5dc9,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,8069c27a8d320c464a2911ceeb642846c6eb7692b6a5bb0444c58074edefb98d,Tests_failed,069ece2b9679a1b37bab0016d021ea587b6c14fac8e3b82843eb143132d7d8cb,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,0.04349470138549805,0.046640872955322266,0.04426383972167969,0.01573348045349121,0.04656791687011719,0.0401616096496582,0.04564023017883301,0.18687915802001953,0.33893537521362305,2.9797465801239014,0.6300480365753174,0.05348968505859375,0.10891151428222656,0.053529977798461914,0.10829758644104004,0.1102912425994873,0.10294699668884277,0.10521626472473145,0.10426688194274902,0.10437941551208496,0.10428929328918457,0.10444283485412598,0.10391664505004883,0.2003629207611084,0.23146533966064453,3.1571671962738037,0.758173942565918,0.10614514350891113,0.10434794425964355,0.1067209243774414,0.10570406913757324,0.10488128662109375 diff --git a/results/combined/merges_timed/hoijui/jawk.csv b/results/combined/merges_timed/hoijui/jawk.csv index a20196de6b..b8dd434bc7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,True,13,119,327,2,True,13,Tests_passed,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,True,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,117a596f3b63779c3ce121036f850701f4b82a70fedeefbd5f2d5a1255e5041f,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,Merge_failed,6f656739c70495c9cfb00fe36abc1bd166ca5a124744b9cf90579f81503c5643,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,a24334c84cddaab2df768fea41b40d25266a96fdc57966a8192315f73b753b9c,Merge_failed,5f937952864215eddfbee5d93128ea9689ddec20150262bbd50b2a1e652221e9,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Tests_failed,e0eee870bd1ff6b30eb2dde464d9caa19b11d97b17f1d585f96896717c52e1e8,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,0.04949831962585449,0.056296348571777344,0.053998470306396484,0.024215221405029297,0.04707217216491699,0.054868221282958984,0.06153273582458496,0.045694828033447266,0.13567352294921875,3.631941795349121,1.0658388137817383,0.056302785873413086,0.0542757511138916,0.05556893348693848,0.05682539939880371,0.05411243438720703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,True,13,119,327,2,True,13,Tests_passed,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,True,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,117a596f3b63779c3ce121036f850701f4b82a70fedeefbd5f2d5a1255e5041f,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,Merge_failed,6f656739c70495c9cfb00fe36abc1bd166ca5a124744b9cf90579f81503c5643,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,a24334c84cddaab2df768fea41b40d25266a96fdc57966a8192315f73b753b9c,Merge_failed,5f937952864215eddfbee5d93128ea9689ddec20150262bbd50b2a1e652221e9,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Tests_failed,e0eee870bd1ff6b30eb2dde464d9caa19b11d97b17f1d585f96896717c52e1e8,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,cc90ef4760290cc23de36da91e42f3ca91e2a9b9a66a31a608b7cf3f9e3d2cf3,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,0.04949831962585449,0.056296348571777344,0.053998470306396484,0.024215221405029297,0.04707217216491699,0.054868221282958984,0.06153273582458496,0.045694828033447266,0.13567352294921875,3.631941795349121,1.0658388137817383,0.056302785873413086,0.0542757511138916,0.05556893348693848,0.05682539939880371,0.05411243438720703,0.05326104164123535,0.052205562591552734,0.05355334281921387,0.05467104911804199,0.05452728271484375,0.05536246299743652,0.05291938781738281,0.0861656665802002,0.09815621376037598,3.529482364654541,1.1069443225860596,0.0517115592956543,0.052736520767211914,0.05380368232727051,0.05405449867248535,0.051995038986206055 diff --git a/results/combined/merges_timed/hoten/java-delaunay.csv b/results/combined/merges_timed/hoten/java-delaunay.csv index 59c739eee7..793af8ca62 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,Tests_passed,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,True,10,30,417,2,True,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,True,10,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,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_failed,fd39e66fc39c389c95daea0af75ccab62a07c91aae16e6f1b5d4881475203638,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,0.05173039436340332,0.05110502243041992,0.033560991287231445,0.017709970474243164,0.0540928840637207,0.04746675491333008,0.04892134666442871,0.15790843963623047,0.11661577224731445,0.038373708724975586,0.5960912704467773,0.03772783279418945,0.06457018852233887,0.03737688064575195,0.06313085556030273,0.06371927261352539 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,Tests_passed,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,True,10,30,417,2,True,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,True,10,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,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_failed,fd39e66fc39c389c95daea0af75ccab62a07c91aae16e6f1b5d4881475203638,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,0.05173039436340332,0.05110502243041992,0.033560991287231445,0.017709970474243164,0.0540928840637207,0.04746675491333008,0.04892134666442871,0.15790843963623047,0.11661577224731445,0.038373708724975586,0.5960912704467773,0.03772783279418945,0.06457018852233887,0.03737688064575195,0.06313085556030273,0.06371927261352539,0.06028246879577637,0.06113243103027344,0.06302404403686523,0.06131482124328613,0.06301355361938477,0.06135702133178711,0.06058979034423828,0.09328508377075195,0.09340095520019531,0.07410526275634766,0.6417734622955322,0.06152629852294922,0.059535980224609375,0.06168818473815918,0.06145739555358887,0.062155961990356445 diff --git a/results/combined/merges_timed/hoverruan/weiboclient4j.csv b/results/combined/merges_timed/hoverruan/weiboclient4j.csv index fb968a3b20..2c6726972b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,True,59,152,3352,3,True,59,Tests_passed,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,True,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,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,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,Merge_failed,0bee9cdd6988a7c96b7a47af82fe905f16b4ebb6aa09ab3c55e639dfa6d20435,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,c05bfb9edd459b7c2eed8a9645132122e1258c087c3b676445001182c24263e7,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,2e3a501950b984dd3333b100eaa8f526b9795f324117b67ebd9d093803da2bdb,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,0.05129241943359375,0.013734817504882812,0.052590370178222656,0.01950836181640625,0.048041343688964844,0.05308055877685547,0.05303001403808594,0.23639893531799316,0.23688006401062012,1.5864169597625732,0.5796210765838623,0.05886363983154297,0.058843135833740234,0.055757999420166016,0.0608363151550293,0.05975961685180664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,True,59,152,3352,3,True,59,Tests_passed,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,True,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,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,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,Merge_failed,0bee9cdd6988a7c96b7a47af82fe905f16b4ebb6aa09ab3c55e639dfa6d20435,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,c05bfb9edd459b7c2eed8a9645132122e1258c087c3b676445001182c24263e7,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,2e3a501950b984dd3333b100eaa8f526b9795f324117b67ebd9d093803da2bdb,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,0.05129241943359375,0.013734817504882812,0.052590370178222656,0.01950836181640625,0.048041343688964844,0.05308055877685547,0.05303001403808594,0.23639893531799316,0.23688006401062012,1.5864169597625732,0.5796210765838623,0.05886363983154297,0.058843135833740234,0.055757999420166016,0.0608363151550293,0.05975961685180664,0.058073997497558594,0.05717325210571289,0.05770730972290039,0.060575008392333984,0.05966925621032715,0.06082606315612793,0.05772256851196289,0.10691285133361816,0.14122486114501953,1.5437612533569336,0.6390104293823242,0.05711030960083008,0.05655336380004883,0.05607008934020996,0.056546926498413086,0.056794166564941406 diff --git a/results/combined/merges_timed/httpcache4j/httpcache4j.csv b/results/combined/merges_timed/httpcache4j/httpcache4j.csv index 445ac48de9..72fbdaa618 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,True,True,True,10,21,324,9,True,17,Tests_passed,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,True,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,True,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,dc927934833f49dc701bfaaef25c108f22eab72ca7387e3c78ca56892b8183ad,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,Merge_failed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,48710f85d37f44f125780fe7c81e06ebf10108839ea96a4be7a3064e3368f472,Tests_failed,0e8a78f9ccb5327fb0e86b22194e288c603f90691e1f96d23f509b83e9b42b42,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,0.01340484619140625,0.014481067657470703,0.015108346939086914,0.026276111602783203,0.014899969100952148,0.014937639236450195,0.015304327011108398,0.043613433837890625,0.07039451599121094,0.8398621082305908,0.6000790596008301,0.044751882553100586,0.07056212425231934,0.053017377853393555,0.06872820854187012,0.07378983497619629 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,True,True,True,10,21,324,9,True,17,Tests_passed,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,True,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,True,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,dc927934833f49dc701bfaaef25c108f22eab72ca7387e3c78ca56892b8183ad,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,Merge_failed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,48710f85d37f44f125780fe7c81e06ebf10108839ea96a4be7a3064e3368f472,Tests_failed,0e8a78f9ccb5327fb0e86b22194e288c603f90691e1f96d23f509b83e9b42b42,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,0.01340484619140625,0.014481067657470703,0.015108346939086914,0.026276111602783203,0.014899969100952148,0.014937639236450195,0.015304327011108398,0.043613433837890625,0.07039451599121094,0.8398621082305908,0.6000790596008301,0.044751882553100586,0.07056212425231934,0.053017377853393555,0.06872820854187012,0.07378983497619629,0.06885242462158203,0.07235264778137207,0.05519723892211914,0.07158088684082031,0.07063102722167969,0.06419515609741211,0.07022762298583984,0.08704423904418945,0.1026768684387207,0.9139330387115479,0.6431539058685303,0.05622386932373047,0.07096219062805176,0.06754469871520996,0.06841611862182617,0.07114148139953613 diff --git a/results/combined/merges_timed/huaban/jieba-analysis.csv b/results/combined/merges_timed/huaban/jieba-analysis.csv index 7f9da70576..735c5bcb32 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,True,5,10,608548,2,True,5,Tests_passed,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,True,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,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,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,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,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,bfb5be663a6a34b5849c70d312537d486a6a073ffd36c473bc2afcb10e2ca900,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,0.14224481582641602,0.1409595012664795,0.16299104690551758,0.16777467727661133,0.16520333290100098,0.16181135177612305,0.16455721855163574,0.22496676445007324,0.1977524757385254,0.9871673583984375,0.4976348876953125,0.2795572280883789,0.2047436237335205,0.26411867141723633,0.21763110160827637,0.2978177070617676 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,True,5,10,608548,2,True,5,Tests_passed,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,True,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,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,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,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,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,bfb5be663a6a34b5849c70d312537d486a6a073ffd36c473bc2afcb10e2ca900,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,0.14224481582641602,0.1409595012664795,0.16299104690551758,0.16777467727661133,0.16520333290100098,0.16181135177612305,0.16455721855163574,0.22496676445007324,0.1977524757385254,0.9871673583984375,0.4976348876953125,0.2795572280883789,0.2047436237335205,0.26411867141723633,0.21763110160827637,0.2978177070617676,0.19205212593078613,0.28182315826416016,0.1972978115081787,0.30431485176086426,0.1984858512878418,0.30477213859558105,0.20812201499938965,0.37685203552246094,0.353562593460083,1.0658154487609863,0.5721282958984375,0.2722911834716797,0.23471784591674805,0.27364349365234375,0.2198469638824463,0.27799177169799805 diff --git a/results/combined/merges_timed/hudec/sql-processor.csv b/results/combined/merges_timed/hudec/sql-processor.csv index 09bde7f56b..928b27079b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -41,refs/heads/master,e959d1d883ca62621d769bc918107d45c7d62edc,6e987e6a938bebf11be2ef9d5cd80a0b5f1584cc,82513015773e95f8a3345526c8aef447572d34f0,,True,True,Tests_passed,6eff6a41305cb9bcd1a5d4ba5d2c7fc7b560c7b17209cd69d6fc3c2ef6a7e77f,True,188,381,7901,9,True,Tests_passed,fb129caab03aefb955f65ca7b753eab985204ba65b4077f39b7334c6757b8713,True,188,True,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,7c7772f31766083f7cf4592fbffc1742b48308b0f8cb79c37f072c717ea8cf84,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,d9f9018ee2e21bf7755e93bb80467c464bdecbfa1d666aadc5e39b5f3b9b6d29,Merge_failed,64e01dd46198d1d6a7d3a358d6aa29e7605f849dac6badec7ae7171405942340,Merge_failed,d7d7e613e2ee341abe4b87811dd16a1ac70517ea9f5833030e9a915df1cafa97,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,23936ac75a3f1edf56c4e78a510508e4a83f6e857247e66dbb898a8761c20edb,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,3c1ddd91e601e379a74bfcf834ff4fe15dac8e3b611f07f72d49c8a973b36c57,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,0.08392119407653809,0.06131577491760254,0.07291841506958008,0.039266109466552734,0.07282400131225586,0.0626986026763916,0.08128499984741211,0.6850197315216064,0.5448276996612549,3.1803741455078125,1.2903051376342773,0.11251163482666016,0.200669527053833,0.10690522193908691,0.19961190223693848,0.20302391052246094 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +41,refs/heads/master,e959d1d883ca62621d769bc918107d45c7d62edc,6e987e6a938bebf11be2ef9d5cd80a0b5f1584cc,82513015773e95f8a3345526c8aef447572d34f0,,True,True,Tests_passed,6eff6a41305cb9bcd1a5d4ba5d2c7fc7b560c7b17209cd69d6fc3c2ef6a7e77f,True,188,381,7901,9,True,Tests_passed,fb129caab03aefb955f65ca7b753eab985204ba65b4077f39b7334c6757b8713,True,188,True,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,7c7772f31766083f7cf4592fbffc1742b48308b0f8cb79c37f072c717ea8cf84,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,d9f9018ee2e21bf7755e93bb80467c464bdecbfa1d666aadc5e39b5f3b9b6d29,Merge_failed,64e01dd46198d1d6a7d3a358d6aa29e7605f849dac6badec7ae7171405942340,Merge_failed,d7d7e613e2ee341abe4b87811dd16a1ac70517ea9f5833030e9a915df1cafa97,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,23936ac75a3f1edf56c4e78a510508e4a83f6e857247e66dbb898a8761c20edb,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,3c1ddd91e601e379a74bfcf834ff4fe15dac8e3b611f07f72d49c8a973b36c57,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,0.08392119407653809,0.06131577491760254,0.07291841506958008,0.039266109466552734,0.07282400131225586,0.0626986026763916,0.08128499984741211,0.6850197315216064,0.5448276996612549,3.1803741455078125,1.2903051376342773,0.11251163482666016,0.200669527053833,0.10690522193908691,0.19961190223693848,0.20302391052246094,0.19265103340148926,0.19242620468139648,0.19097661972045898,0.19596242904663086,0.1948714256286621,0.18975162506103516,0.19242310523986816,0.35135412216186523,0.40955209732055664,3.3011579513549805,1.4866013526916504,0.18804121017456055,0.18593835830688477,0.18821954727172852,0.1903390884399414,0.18938302993774414 diff --git a/results/combined/merges_timed/hyphen-ated/djbot.csv b/results/combined/merges_timed/hyphen-ated/djbot.csv index a52477e98b..5a0b13da12 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,False,True,4,8,33,2,True,4,Tests_passed,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,True,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,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,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,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,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,1bab1dffe8dd54ed93250c7ae178091346a9c5315f3d97165264003f99355bbb,Tests_failed,39bca1b8bd3fd510280cc627307fa75b76304a6d1d1c783011685d9a2996fd53,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,0.04813790321350098,0.0472414493560791,0.043335676193237305,0.016753435134887695,0.04809141159057617,0.048982858657836914,0.04153156280517578,0.1705930233001709,0.11888480186462402,1.7263095378875732,0.49511218070983887,0.03208422660827637,0.06319236755371094,0.03288412094116211,0.06186962127685547,0.06187248229980469 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,False,True,4,8,33,2,True,4,Tests_passed,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,True,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,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,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,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,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,1bab1dffe8dd54ed93250c7ae178091346a9c5315f3d97165264003f99355bbb,Tests_failed,39bca1b8bd3fd510280cc627307fa75b76304a6d1d1c783011685d9a2996fd53,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,0.04813790321350098,0.0472414493560791,0.043335676193237305,0.016753435134887695,0.04809141159057617,0.048982858657836914,0.04153156280517578,0.1705930233001709,0.11888480186462402,1.7263095378875732,0.49511218070983887,0.03208422660827637,0.06319236755371094,0.03288412094116211,0.06186962127685547,0.06187248229980469,0.06158900260925293,0.06264662742614746,0.061609745025634766,0.062149763107299805,0.060294389724731445,0.062303781509399414,0.06123828887939453,0.09937572479248047,0.09343171119689941,1.858968734741211,0.5428860187530518,0.06104540824890137,0.06020379066467285,0.06026744842529297,0.06305646896362305,0.05970454216003418 diff --git a/results/combined/merges_timed/icoloma/tldgen.csv b/results/combined/merges_timed/icoloma/tldgen.csv index b4226bb94e..3f6bded16c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,True,True,Tests_passed,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,True,18,53,441,4,True,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,True,18,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,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,Tests_passed,5d2041fd940fc45b996f4e98551d2e8fa02bd238c10c9c437da0d5ff34b3ea9e,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,419437a7c014f2d74ca4dda0659d23e3ece3783f9daa0d4dcd57de92d8f6ef2d,Merge_failed,f69f0148f37bb03775e67a40bea7e2381341da59c198c99928c9204750b770be,Tests_failed,565e306f42f11aae951f1a11a2ad6df57e6a727492cdf5024f613c3580b02e73,Tests_failed,a9351b01f4aa60520c91d01db6988644d35ed91565323839902cf5568d0d5863,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,0.03592252731323242,0.04003334045410156,0.045203447341918945,0.015115976333618164,0.0391545295715332,0.04344630241394043,0.04012918472290039,0.2759730815887451,0.2071821689605713,1.329519271850586,0.3692893981933594,0.04900860786437988,0.07938528060913086,0.043392181396484375,0.08165359497070312,0.08198666572570801 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,True,True,Tests_passed,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,True,18,53,441,4,True,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,True,18,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,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,Tests_passed,5d2041fd940fc45b996f4e98551d2e8fa02bd238c10c9c437da0d5ff34b3ea9e,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,419437a7c014f2d74ca4dda0659d23e3ece3783f9daa0d4dcd57de92d8f6ef2d,Merge_failed,f69f0148f37bb03775e67a40bea7e2381341da59c198c99928c9204750b770be,Tests_failed,565e306f42f11aae951f1a11a2ad6df57e6a727492cdf5024f613c3580b02e73,Tests_failed,a9351b01f4aa60520c91d01db6988644d35ed91565323839902cf5568d0d5863,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,Merge_failed,38091c06b811344777deb3da5b28b3b14de087563ff64731a5b77686e50fcec3,0.03592252731323242,0.04003334045410156,0.045203447341918945,0.015115976333618164,0.0391545295715332,0.04344630241394043,0.04012918472290039,0.2759730815887451,0.2071821689605713,1.329519271850586,0.3692893981933594,0.04900860786437988,0.07938528060913086,0.043392181396484375,0.08165359497070312,0.08198666572570801,0.07799553871154785,0.07809019088745117,0.07768058776855469,0.0776665210723877,0.07691383361816406,0.07831454277038574,0.07748270034790039,0.1422131061553955,0.1578691005706787,1.360753059387207,0.45201992988586426,0.07922935485839844,0.0792841911315918,0.07617330551147461,0.07970929145812988,0.07664775848388672 diff --git a/results/combined/merges_timed/idpf/epubcheck.csv b/results/combined/merges_timed/idpf/epubcheck.csv index 8632814c22..68ad8f7d7c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,True,569,983,36392.0,13,True,593,Tests_passed,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,True,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,True,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,b0121cdcf1778d00696ffd0ac8470931bb9522c0ab46a6b993319fe74914a249,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,3f1c4bad836c73feba3a2b08dc6750aa1740888466ac12f0d848c6dc7c66751c,Merge_failed,f7328e62d0476db04354ebc87eba8058b06030a542ece9fe380033f2db3c067c,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,Merge_failed,a58bf5332b9f1eff7210c1197135138310c05968782f48d95e6a2c3f51e80412,Merge_failed,9c81d384b7d2b8e645828d5acb42b378aa9cfbd60a7a073202e5d26c6e8daa3e,Merge_failed,a5fa80d5dafbba1576b2db142e89cac2882a26b019da62500f93376046b22d49,Merge_failed,a5fa80d5dafbba1576b2db142e89cac2882a26b019da62500f93376046b22d49,Merge_failed,162fdfdc41d10ae6ce6ac291a89b0c89fcaa164a480f79263c6d340b8875f4c7,Merge_failed,1d3444022454e2cfd72b01ad93c1064efec55a9174bffdd26a4cbd5e2ba0251a,Merge_failed,764db4623e888d07f16ff004b0891b6ccb30f2e8c47129b2a3db64d7af776e91,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,0.10576915740966797,0.10564422607421875,0.1366748809814453,0.15181684494018555,0.13801240921020508,0.13880634307861328,0.1388232707977295,0.8246855735778809,0.9045107364654541,0.12281370162963867,2.073773145675659,0.24048113822937012,0.6244866847991943,0.27254557609558105,0.5190489292144775,0.6057076454162598 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,True,569,983,36392.0,13,True,593,Tests_passed,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,True,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,True,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,b0121cdcf1778d00696ffd0ac8470931bb9522c0ab46a6b993319fe74914a249,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,3f1c4bad836c73feba3a2b08dc6750aa1740888466ac12f0d848c6dc7c66751c,Merge_failed,f7328e62d0476db04354ebc87eba8058b06030a542ece9fe380033f2db3c067c,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,Merge_failed,a58bf5332b9f1eff7210c1197135138310c05968782f48d95e6a2c3f51e80412,Merge_failed,9c81d384b7d2b8e645828d5acb42b378aa9cfbd60a7a073202e5d26c6e8daa3e,Merge_failed,a5fa80d5dafbba1576b2db142e89cac2882a26b019da62500f93376046b22d49,Merge_failed,a5fa80d5dafbba1576b2db142e89cac2882a26b019da62500f93376046b22d49,Merge_failed,162fdfdc41d10ae6ce6ac291a89b0c89fcaa164a480f79263c6d340b8875f4c7,Merge_failed,1d3444022454e2cfd72b01ad93c1064efec55a9174bffdd26a4cbd5e2ba0251a,Merge_failed,764db4623e888d07f16ff004b0891b6ccb30f2e8c47129b2a3db64d7af776e91,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,18f8cf9936db7d436507e4d2c7ca60da0e9eaef327a952feb82731584c11fbcb,Merge_failed,425bf5d78c21b5b2110b07d6507d3ab3e6a3a8a02cab20c3d5fb3404375bc5b1,0.10576915740966797,0.10564422607421875,0.1366748809814453,0.15181684494018555,0.13801240921020508,0.13880634307861328,0.1388232707977295,0.8246855735778809,0.9045107364654541,0.12281370162963867,2.073773145675659,0.24048113822937012,0.6244866847991943,0.27254557609558105,0.5190489292144775,0.6057076454162598,0.5636594295501709,0.5974340438842773,0.606482982635498,0.539268970489502,0.5199463367462158,0.6798038482666016,0.6481935977935791,0.9057295322418213,0.8636624813079834,0.7105965614318848,2.3699896335601807,0.44780468940734863,0.4731431007385254,0.4902832508087158,0.5350809097290039,0.49637484550476074 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 f47a78c9fd..d4f6a27edd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,True,False,Tests_passed,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,True,3,14,197,2,True,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,True,3,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,0649e92f16ffc1b673eaed99e86938efdccfeee54be22244b62702b1536e8d57,Merge_failed,c4e6045532fd92e72df86a9ea5f11178e19b7bf206b85346811f6cbb9ff5511f,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,3426911c579f9c08434a244b495e688c8a3feca9ff31d447f30e77f10f3f2ca4,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,41b795c21bc8a2a5c2683e058ebbc77a52072506525a12c22af42a728ee0ea4a,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,0.04097628593444824,0.042078256607055664,0.010428190231323242,0.013342142105102539,0.03910565376281738,0.04004240036010742,0.03969454765319824,0.15774011611938477,0.18218755722045898,1.9066519737243652,0.6739308834075928,0.040693044662475586,0.041661977767944336,0.040639400482177734,0.04301166534423828,0.04245114326477051 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,True,False,Tests_passed,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,True,3,14,197,2,True,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,True,3,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,0649e92f16ffc1b673eaed99e86938efdccfeee54be22244b62702b1536e8d57,Merge_failed,c4e6045532fd92e72df86a9ea5f11178e19b7bf206b85346811f6cbb9ff5511f,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,3426911c579f9c08434a244b495e688c8a3feca9ff31d447f30e77f10f3f2ca4,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,41b795c21bc8a2a5c2683e058ebbc77a52072506525a12c22af42a728ee0ea4a,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,0.04097628593444824,0.042078256607055664,0.010428190231323242,0.013342142105102539,0.03910565376281738,0.04004240036010742,0.03969454765319824,0.15774011611938477,0.18218755722045898,1.9066519737243652,0.6739308834075928,0.040693044662475586,0.041661977767944336,0.040639400482177734,0.04301166534423828,0.04245114326477051,0.040282249450683594,0.039458274841308594,0.03971290588378906,0.04145646095275879,0.04086422920227051,0.042133331298828125,0.04126381874084473,0.0709066390991211,0.11278557777404785,1.8772797584533691,0.7210187911987305,0.041013240814208984,0.04047107696533203,0.03949785232543945,0.040895700454711914,0.04116034507751465 diff --git a/results/combined/merges_timed/igniterealtime/tinder.csv b/results/combined/merges_timed/igniterealtime/tinder.csv index 779b3d27aa..9ea1aa8f6c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,True,32,43,17892,2,True,32,Tests_passed,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,True,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,1ba600cb78cdc76e4f1574e23d5332849bc9c335065803a0738d095186774599,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Tests_failed,6c15e686cdedbea07a57a6627c9adc97c89b65cbfbd8693569a37bfeca82bed6,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,0.043617963790893555,0.04713320732116699,0.03661394119262695,0.019115447998046875,0.04891824722290039,0.01510763168334961,0.04787945747375488,0.1809542179107666,0.12101268768310547,1.1847667694091797,0.6708464622497559,0.057044267654418945,0.05078125,0.30391669273376465,0.5646886825561523,0.048723697662353516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,True,32,43,17892,2,True,32,Tests_passed,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,True,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,1ba600cb78cdc76e4f1574e23d5332849bc9c335065803a0738d095186774599,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Tests_failed,6c15e686cdedbea07a57a6627c9adc97c89b65cbfbd8693569a37bfeca82bed6,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,0.043617963790893555,0.04713320732116699,0.03661394119262695,0.019115447998046875,0.04891824722290039,0.01510763168334961,0.04787945747375488,0.1809542179107666,0.12101268768310547,1.1847667694091797,0.6708464622497559,0.057044267654418945,0.05078125,0.30391669273376465,0.5646886825561523,0.048723697662353516,0.558347225189209,0.04709315299987793,0.5592119693756104,0.05022406578063965,0.560915470123291,0.5605931282043457,0.5596766471862793,0.591907262802124,0.6056277751922607,1.3079047203063965,0.8294625282287598,0.5606274604797363,0.561312198638916,0.5579237937927246,0.5666344165802002,0.05026888847351074 diff --git a/results/combined/merges_timed/ignorance77/transformiceapi.csv b/results/combined/merges_timed/ignorance77/transformiceapi.csv index fb580d0b34..d2faea9ef8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,True,11,20,219.0,2,True,11,Tests_passed,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,True,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,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,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,5f0b197dc7a0d14e5091486f508aabcf1e2801df0efedbfa693e66c911e7454b,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,0.04630923271179199,0.03925466537475586,0.042794227600097656,0.0148773193359375,0.03906536102294922,0.041838645935058594,0.03956198692321777,0.17013835906982422,0.11568880081176758,0.656104326248169,0.2990400791168213,0.03174090385437012,0.057404518127441406,0.030646800994873047,0.05637764930725098,0.057259559631347656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,True,11,20,219.0,2,True,11,Tests_passed,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,True,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,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,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,5f0b197dc7a0d14e5091486f508aabcf1e2801df0efedbfa693e66c911e7454b,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,f1bd3b00b2670f5e8f62ac8f15d40ae632bbc051e8e8a04e3a4aaa36c2e2f490,Tests_passed,02b254248d13554cadb568c3671284e6bc913a0a873d1bee56eb0cab34860b6f,0.04630923271179199,0.03925466537475586,0.042794227600097656,0.0148773193359375,0.03906536102294922,0.041838645935058594,0.03956198692321777,0.17013835906982422,0.11568880081176758,0.656104326248169,0.2990400791168213,0.03174090385437012,0.057404518127441406,0.030646800994873047,0.05637764930725098,0.057259559631347656,0.05430150032043457,0.055043697357177734,0.052863359451293945,0.05561065673828125,0.0539860725402832,0.052962541580200195,0.05344653129577637,0.08476614952087402,0.08455252647399902,0.6939234733581543,0.328110933303833,0.054183006286621094,0.05420422554016113,0.055666208267211914,0.05434131622314453,0.0550537109375 diff --git a/results/combined/merges_timed/iipc/webarchive-commons.csv b/results/combined/merges_timed/iipc/webarchive-commons.csv index 55ceb48af8..93549f2848 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,True,25,312,1033.0,4,True,25,Tests_passed,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,True,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,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,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,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,f073f61b6c716b8dc81491225696a48ec17a35c606c8f5cdc6d35741035e6b11,Tests_failed,a5f4791ecd40a32e9bc9a7945fce8361b545b5c291f570c74ecd2518d6aa2ff3,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,0.059456586837768555,0.04550886154174805,0.07052230834960938,0.03063821792602539,0.047484397888183594,0.058524370193481445,0.04426097869873047,0.2897777557373047,0.23236751556396484,2.0303752422332764,0.7461948394775391,0.054497480392456055,0.1184234619140625,0.05408358573913574,0.11926627159118652,0.11932373046875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,True,25,312,1033.0,4,True,25,Tests_passed,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,True,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,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,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,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,f073f61b6c716b8dc81491225696a48ec17a35c606c8f5cdc6d35741035e6b11,Tests_failed,a5f4791ecd40a32e9bc9a7945fce8361b545b5c291f570c74ecd2518d6aa2ff3,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,0.059456586837768555,0.04550886154174805,0.07052230834960938,0.03063821792602539,0.047484397888183594,0.058524370193481445,0.04426097869873047,0.2897777557373047,0.23236751556396484,2.0303752422332764,0.7461948394775391,0.054497480392456055,0.1184234619140625,0.05408358573913574,0.11926627159118652,0.11932373046875,0.11757135391235352,0.11697506904602051,0.12139153480529785,0.11992883682250977,0.12403202056884766,0.12238121032714844,0.12354660034179688,0.1949787139892578,0.20502948760986328,2.3015027046203613,0.8815557956695557,0.1175229549407959,0.11923742294311523,0.11913752555847168,0.12142348289489746,0.12132430076599121 diff --git a/results/combined/merges_timed/imagej/imagej-ops.csv b/results/combined/merges_timed/imagej/imagej-ops.csv index 2f759316d5..188fe808c5 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,Tests_passed,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,True,966,3076,16077,3,True,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,True,966,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,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,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,5697ddf2751b709eef3321c89b3b6f4dc0b5af3fa9712a9e09e9db957c28444f,Tests_failed,8f4fa5e8745cb01a51e8376eb9e82e9cd5c9069c92109d20e8d0a2ae3ba0fc76,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,0.05912613868713379,0.06000947952270508,0.08201742172241211,0.09908747673034668,0.08181929588317871,0.08155989646911621,0.08225727081298828,0.14520978927612305,0.1675703525543213,1.5364396572113037,16.782801866531372,0.15090513229370117,0.17894244194030762,0.15392708778381348,0.17826247215270996,0.17673373222351074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,Tests_passed,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,True,966,3076,16077,3,True,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,True,966,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,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,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,5697ddf2751b709eef3321c89b3b6f4dc0b5af3fa9712a9e09e9db957c28444f,Tests_failed,8f4fa5e8745cb01a51e8376eb9e82e9cd5c9069c92109d20e8d0a2ae3ba0fc76,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,0.05912613868713379,0.06000947952270508,0.08201742172241211,0.09908747673034668,0.08181929588317871,0.08155989646911621,0.08225727081298828,0.14520978927612305,0.1675703525543213,1.5364396572113037,16.782801866531372,0.15090513229370117,0.17894244194030762,0.15392708778381348,0.17826247215270996,0.17673373222351074,0.22194504737854004,0.22837066650390625,0.2521696090698242,0.24307537078857422,0.1974334716796875,0.18120265007019043,0.17274761199951172,0.33554744720458984,0.3081974983215332,1.9103353023529053,16.109906911849976,0.17476248741149902,0.17728161811828613,0.17016220092773438,0.17531466484069824,0.18021106719970703 diff --git a/results/combined/merges_timed/imglib/imglib2.csv b/results/combined/merges_timed/imglib/imglib2.csv index 8479dcba7d..a813ef0147 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -96,refs/heads/master,e9d10e6d0675c448d1b13f0af39f92bf384fb455,4d25ecee827a42416821dd3e3e14159ba2de4653,b78e84541f5efaee6c249670f15f4c4cb819a7ba,,True,True,True,463.0,636,8611.0,3,True,463,Tests_passed,def684d8490fff814658fe44d22a0f557383fd9ea3de7a4c00757e7566d54214,True,Tests_passed,621b8effb3dbb1340c9bd9a023aa4e979b272b16c4e52335914fe0118744544a,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,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,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,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,34db26281620cb0c3212f6a9441c8a52289a9279610f54e29f1af4c4b73e271d,Tests_failed,1f58b6cc21a22cef7e49d0efcf7cd658197f3d270fb4f8b131eedc08c9eba54e,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,0.04379534721374512,0.038384199142456055,0.059427738189697266,0.05691218376159668,0.05996251106262207,0.06057858467102051,0.05639338493347168,0.21898436546325684,0.15988683700561523,1.2166314125061035,3.5694611072540283,0.0902862548828125,0.1367189884185791,0.08880448341369629,0.13068485260009766,0.13977265357971191 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +96,refs/heads/master,e9d10e6d0675c448d1b13f0af39f92bf384fb455,4d25ecee827a42416821dd3e3e14159ba2de4653,b78e84541f5efaee6c249670f15f4c4cb819a7ba,,True,True,True,463.0,636,8611.0,3,True,463,Tests_passed,def684d8490fff814658fe44d22a0f557383fd9ea3de7a4c00757e7566d54214,True,Tests_passed,621b8effb3dbb1340c9bd9a023aa4e979b272b16c4e52335914fe0118744544a,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,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,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,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,34db26281620cb0c3212f6a9441c8a52289a9279610f54e29f1af4c4b73e271d,Tests_failed,1f58b6cc21a22cef7e49d0efcf7cd658197f3d270fb4f8b131eedc08c9eba54e,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,0.04379534721374512,0.038384199142456055,0.059427738189697266,0.05691218376159668,0.05996251106262207,0.06057858467102051,0.05639338493347168,0.21898436546325684,0.15988683700561523,1.2166314125061035,3.5694611072540283,0.0902862548828125,0.1367189884185791,0.08880448341369629,0.13068485260009766,0.13977265357971191,0.13948750495910645,0.13864898681640625,0.14950108528137207,0.15031933784484863,0.15098166465759277,0.15728211402893066,0.1533069610595703,0.21818089485168457,0.2092130184173584,1.419140100479126,4.000223398208618,0.1357102394104004,0.13476109504699707,0.14201855659484863,0.138291597366333,0.14025235176086426 diff --git a/results/combined/merges_timed/imixs/imixs-workflow.csv b/results/combined/merges_timed/imixs/imixs-workflow.csv index 7007890848..c47f61ce5d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,f14cc658356312ecdf6111e1745d7d29957f7194,9e4f88bb06fb937ffd51c8875bbaaf364d404ec4,b8df0eb1ac52af8caaa7d7f66d41dcf8b4177842,,True,True,True,148,540,11969,15,True,149,Tests_passed,f114f281f48c0e044aaa244913c577eb07adf43cec9af32afe25da9428d6a67b,True,Tests_passed,4a8d02e85a4996768d0dfd70046d40ad7f95401580585cbab221525697b202ad,True,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,a8a03e2af72fb75ca49eb155ca5e76c1fddcfdc77e566b608896b27e493b6e68,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,67aa636600a8f92a74746a8f7d94400f65ac450a3a1c39305631604db47a9306,Merge_timedout,,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,36d00eafebf1b8cc85d79ad77f242b32114ee02c39ec36d4f3b49d54ee847972,Merge_failed,ce8416c2b3e82d5324699a231ec9d2f3da4b901cb767dc0b6dc9751b28ba7cac,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,c47db6999ab0ecd014993cd5664fa754f8f0007743f70ce9b3d022bb6094dba0,Merge_failed,c47db6999ab0ecd014993cd5664fa754f8f0007743f70ce9b3d022bb6094dba0,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,c527ed3b0be8d229467403e0ca11b232da1cf81c9beb20ce34ec3fe8621154e0,Merge_failed,d79d9c8632f2f0151a85215f22911f6e41b334996bca68a9d38f212293d07871,Merge_failed,6075f5457869a0d2d3471e75989c32b3c368921e6e3e4a53c6ecbc90f1a9df54,Merge_timedout,,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,0.07269597053527832,0.05832242965698242,0.056973934173583984,0.04085421562194824,0.06996822357177734,0.056822776794433594,0.07461667060852051,1.0158157348632812,0.8047230243682861,5.574890851974487,-1.0,0.15748119354248047,0.27318310737609863,0.17725658416748047,0.3573644161224365,0.38531041145324707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,f14cc658356312ecdf6111e1745d7d29957f7194,9e4f88bb06fb937ffd51c8875bbaaf364d404ec4,b8df0eb1ac52af8caaa7d7f66d41dcf8b4177842,,True,True,True,148,540,11969,15,True,149,Tests_passed,f114f281f48c0e044aaa244913c577eb07adf43cec9af32afe25da9428d6a67b,True,Tests_passed,4a8d02e85a4996768d0dfd70046d40ad7f95401580585cbab221525697b202ad,True,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,a8a03e2af72fb75ca49eb155ca5e76c1fddcfdc77e566b608896b27e493b6e68,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,67aa636600a8f92a74746a8f7d94400f65ac450a3a1c39305631604db47a9306,Merge_timedout,,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,36d00eafebf1b8cc85d79ad77f242b32114ee02c39ec36d4f3b49d54ee847972,Merge_failed,ce8416c2b3e82d5324699a231ec9d2f3da4b901cb767dc0b6dc9751b28ba7cac,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,Merge_failed,c47db6999ab0ecd014993cd5664fa754f8f0007743f70ce9b3d022bb6094dba0,Merge_failed,c47db6999ab0ecd014993cd5664fa754f8f0007743f70ce9b3d022bb6094dba0,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,c527ed3b0be8d229467403e0ca11b232da1cf81c9beb20ce34ec3fe8621154e0,Merge_failed,d79d9c8632f2f0151a85215f22911f6e41b334996bca68a9d38f212293d07871,Merge_failed,6075f5457869a0d2d3471e75989c32b3c368921e6e3e4a53c6ecbc90f1a9df54,Merge_timedout,,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Merge_failed,e26b8194782e12ca6608668f94d3fcc342ec5b4a68d322c485388aac45b2f4ed,Tests_failed,20d0dc58aad407f4976218a32cc2d0bc8ce8edcb4e24bc341d1641ab22620bd3,0.07269597053527832,0.05832242965698242,0.056973934173583984,0.04085421562194824,0.06996822357177734,0.056822776794433594,0.07461667060852051,1.0158157348632812,0.8047230243682861,5.574890851974487,-1.0,0.15748119354248047,0.27318310737609863,0.17725658416748047,0.3573644161224365,0.38531041145324707,0.35666894912719727,0.3794074058532715,0.35666537284851074,0.39169955253601074,0.3705153465270996,0.3665904998779297,0.3406946659088135,0.6155595779418945,0.7006123065948486,6.6613969802856445,-1.0,0.40513134002685547,0.4094655513763428,0.376375675201416,0.3773212432861328,0.4067654609680176 diff --git a/results/combined/merges_timed/immobilienscout24/deadcode4j.csv b/results/combined/merges_timed/immobilienscout24/deadcode4j.csv index 248c7a040c..e7f2e0db11 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,69518ebbfef40f661ff6ab30ea9ab758a81509c7,89708cc1c36090ba0d00f3f073d2cdf5f6704802,78d4b2bcfb7031e780bb8c612fa46916a19f02f3,,True,True,Tests_passed,3422aa2dce2dc2dd452361fac258e530461f98c09c7a85d1a75c9206c224c04e,True,32,122,467,6,True,Tests_passed,201d90b62862cfbbd85d5a9d194e0348ff2680348c36013e6306c91763511d29,True,34,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,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,a4afb5dceea3293aae7a90d0a3cc2d96568b0c1c46ad99f572cf77c26e1f9b2c,Merge_failed,9b874f63aea45818b0f3f6b690120b5eff2c4ec5a0effc3e36c2c0b21cadf107,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,8fac5f80eaeff0261aa8574ec46af6ae8c41b521c3336f772c75b4b4cf8cb0d3,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,33eaa6eaf4b4ff7b78314686e3b3adf2a32ef416608cbe18ba4fe6f8bb4a98e0,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,0.04839801788330078,0.042359352111816406,0.04795646667480469,0.01986074447631836,0.046495914459228516,0.046027183532714844,0.0283968448638916,0.37354063987731934,0.3595693111419678,2.8075954914093018,0.6324582099914551,0.07166576385498047,0.0720057487487793,0.0701906681060791,0.07137274742126465,0.07063651084899902 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,69518ebbfef40f661ff6ab30ea9ab758a81509c7,89708cc1c36090ba0d00f3f073d2cdf5f6704802,78d4b2bcfb7031e780bb8c612fa46916a19f02f3,,True,True,Tests_passed,3422aa2dce2dc2dd452361fac258e530461f98c09c7a85d1a75c9206c224c04e,True,32,122,467,6,True,Tests_passed,201d90b62862cfbbd85d5a9d194e0348ff2680348c36013e6306c91763511d29,True,34,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,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,a4afb5dceea3293aae7a90d0a3cc2d96568b0c1c46ad99f572cf77c26e1f9b2c,Merge_failed,9b874f63aea45818b0f3f6b690120b5eff2c4ec5a0effc3e36c2c0b21cadf107,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,8fac5f80eaeff0261aa8574ec46af6ae8c41b521c3336f772c75b4b4cf8cb0d3,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,33eaa6eaf4b4ff7b78314686e3b3adf2a32ef416608cbe18ba4fe6f8bb4a98e0,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,0.04839801788330078,0.042359352111816406,0.04795646667480469,0.01986074447631836,0.046495914459228516,0.046027183532714844,0.0283968448638916,0.37354063987731934,0.3595693111419678,2.8075954914093018,0.6324582099914551,0.07166576385498047,0.0720057487487793,0.0701906681060791,0.07137274742126465,0.07063651084899902,0.07086944580078125,0.07254934310913086,0.07092642784118652,0.06919598579406738,0.07022547721862793,0.07272219657897949,0.06956863403320312,0.1604769229888916,0.25195765495300293,3.1905221939086914,0.7395849227905273,0.07369875907897949,0.07321715354919434,0.07387065887451172,0.07283496856689453,0.07369327545166016 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 bff26e27c3..fbdd526130 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,True,True,Tests_passed,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,True,7,31,285,2,True,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,True,7,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,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,3e0a927727bb4488b9201f820273b00f43f806d92611a530b012510edd10e9bb,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,0.008878231048583984,0.009877204895019531,0.008891105651855469,0.014811515808105469,0.008838415145874023,0.009113311767578125,0.009033918380737305,0.03432512283325195,0.06674766540527344,0.43909597396850586,0.42749810218811035,0.031883955001831055,0.03292965888977051,0.031954050064086914,0.033082008361816406,0.03878617286682129 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,True,True,Tests_passed,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,True,7,31,285,2,True,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,True,7,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,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,3e0a927727bb4488b9201f820273b00f43f806d92611a530b012510edd10e9bb,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,0.008878231048583984,0.009877204895019531,0.008891105651855469,0.014811515808105469,0.008838415145874023,0.009113311767578125,0.009033918380737305,0.03432512283325195,0.06674766540527344,0.43909597396850586,0.42749810218811035,0.031883955001831055,0.03292965888977051,0.031954050064086914,0.033082008361816406,0.03878617286682129,0.032470703125,0.0372164249420166,0.03201866149902344,0.03815197944641113,0.03192448616027832,0.03237295150756836,0.03229951858520508,0.0636143684387207,0.06361818313598633,0.44057369232177734,0.4554481506347656,0.03207850456237793,0.03296947479248047,0.032042741775512695,0.03246760368347168,0.03842973709106445 diff --git a/results/combined/merges_timed/inaiat/jqplot4java.csv b/results/combined/merges_timed/inaiat/jqplot4java.csv index 8a70382e77..b16ed76070 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,True,,Tests_passed,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,True,21,246,,4,True,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,True,21,True,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,6421e852240343f8a109b56296306376f32de369ff94e549debd31ce4d6e9177,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,Merge_failed,7eff195ea8a65a934b423787ed27645d44fc43221d36d0aea2b79d07fddcaeb1,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,e70281b2989e8bb51542a253357f3740c04fe5ca879db18415875f1ac39bcecb,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,0.010399818420410156,0.010516643524169922,0.011085748672485352,0.01807236671447754,0.010526418685913086,0.010440826416015625,0.010524988174438477,0.0598602294921875,0.20551323890686035,1.68141508102417,0.4889686107635498,0.06302499771118164,0.06215548515319824,0.061722517013549805,0.06348562240600586,0.06180691719055176 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,True,,Tests_passed,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,True,21,246,,4,True,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,True,21,True,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,6421e852240343f8a109b56296306376f32de369ff94e549debd31ce4d6e9177,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,Merge_failed,7eff195ea8a65a934b423787ed27645d44fc43221d36d0aea2b79d07fddcaeb1,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,e70281b2989e8bb51542a253357f3740c04fe5ca879db18415875f1ac39bcecb,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,0.010399818420410156,0.010516643524169922,0.011085748672485352,0.01807236671447754,0.010526418685913086,0.010440826416015625,0.010524988174438477,0.0598602294921875,0.20551323890686035,1.68141508102417,0.4889686107635498,0.06302499771118164,0.06215548515319824,0.061722517013549805,0.06348562240600586,0.06180691719055176,0.06331110000610352,0.06028318405151367,0.06101870536804199,0.061102867126464844,0.06424450874328613,0.06373405456542969,0.06287717819213867,0.12891697883605957,0.18416190147399902,1.8285846710205078,0.5459985733032227,0.061267852783203125,0.06048750877380371,0.0637819766998291,0.0626528263092041,0.06163144111633301 diff --git a/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv b/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv index 20cb6bd463..5998293ff4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,False,Tests_passed,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,True,2,3,15,2,True,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,True,2,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,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,fd4cf6298c05151314e3b494768781305e6e9598dba5eb0a91afce9530b2cc7b,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,0.03470563888549805,0.045995473861694336,0.04021763801574707,0.014632463455200195,0.03767204284667969,0.043337345123291016,0.039282798767089844,0.17431092262268066,0.11005592346191406,0.7468447685241699,0.27713608741760254,0.03100442886352539,0.05805206298828125,0.032480716705322266,0.057686567306518555,0.058648109436035156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,False,Tests_passed,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,True,2,3,15,2,True,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,True,2,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,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,fd4cf6298c05151314e3b494768781305e6e9598dba5eb0a91afce9530b2cc7b,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,Tests_passed,5f72fe6139037a308510dbe0653246377155848f1e1d42fc7eba29f88023fde5,0.03470563888549805,0.045995473861694336,0.04021763801574707,0.014632463455200195,0.03767204284667969,0.043337345123291016,0.039282798767089844,0.17431092262268066,0.11005592346191406,0.7468447685241699,0.27713608741760254,0.03100442886352539,0.05805206298828125,0.032480716705322266,0.057686567306518555,0.058648109436035156,0.057788848876953125,0.057381629943847656,0.05515170097351074,0.0588374137878418,0.05755734443664551,0.05873918533325195,0.05675697326660156,0.09172320365905762,0.0888528823852539,0.9104540348052979,0.3203403949737549,0.05591583251953125,0.05804705619812012,0.05760502815246582,0.057198524475097656,0.056231021881103516 diff --git a/results/combined/merges_timed/intcode/sweetie.csv b/results/combined/merges_timed/intcode/sweetie.csv index 7dbe64f269..a58bd3ce71 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,True,39,164,1595,3,True,39,Tests_passed,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,True,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,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,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Tests_failed,fb10e31e247138acd3d0f9789a16a0ed2046caf31c5239e4a68847130712f26a,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_failed,cd616d5121db27ff05ab8d8fd6cb75c0a8ab379d9cb9d4a4f4b4db04ae95fe8b,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,0.039609670639038086,0.04143881797790527,0.04576563835144043,0.02076554298400879,0.052899837493896484,0.033179521560668945,0.03999495506286621,0.24328184127807617,0.16951251029968262,0.04039454460144043,0.7548840045928955,0.04852128028869629,0.08683156967163086,0.04905366897583008,0.08683109283447266,0.08676457405090332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,True,39,164,1595,3,True,39,Tests_passed,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,True,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,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,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Tests_failed,fb10e31e247138acd3d0f9789a16a0ed2046caf31c5239e4a68847130712f26a,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_failed,cd616d5121db27ff05ab8d8fd6cb75c0a8ab379d9cb9d4a4f4b4db04ae95fe8b,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,Tests_passed,1e7859624cf6dd78804e317377d29ba073140771a14e652273b88f82480facf7,0.039609670639038086,0.04143881797790527,0.04576563835144043,0.02076554298400879,0.052899837493896484,0.033179521560668945,0.03999495506286621,0.24328184127807617,0.16951251029968262,0.04039454460144043,0.7548840045928955,0.04852128028869629,0.08683156967163086,0.04905366897583008,0.08683109283447266,0.08676457405090332,0.0940706729888916,0.08928871154785156,0.09263873100280762,0.09219551086425781,0.09278130531311035,0.09154462814331055,0.0916597843170166,0.1460728645324707,0.14425873756408691,0.10692644119262695,0.8976097106933594,0.09070301055908203,0.0894169807434082,0.09023785591125488,0.09145498275756836,0.08793306350708008 diff --git a/results/combined/merges_timed/ipeirotis/get-another-label.csv b/results/combined/merges_timed/ipeirotis/get-another-label.csv index 414190f063..7e24a9e342 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,True,7,32,147.0,2,True,7,Tests_passed,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,True,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,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,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,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,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,7e699d18eb7e2c52cf0aca03489de4878a6d05a82733800664b640e801b3fd49,Tests_passed,959ad5bb6493f42775b8ec73488f9a75882831c2e45515eea5b5bd3a5964e51c,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,0.014805793762207031,0.014671802520751953,0.01672530174255371,0.02363872528076172,0.01696467399597168,0.01643991470336914,0.016450166702270508,0.04605889320373535,0.07242536544799805,1.2843737602233887,0.40102243423461914,0.04433846473693848,0.06874871253967285,0.04335594177246094,0.06722664833068848,0.06950974464416504 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,True,7,32,147.0,2,True,7,Tests_passed,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,True,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,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,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,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,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,7e699d18eb7e2c52cf0aca03489de4878a6d05a82733800664b640e801b3fd49,Tests_passed,959ad5bb6493f42775b8ec73488f9a75882831c2e45515eea5b5bd3a5964e51c,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,0.014805793762207031,0.014671802520751953,0.01672530174255371,0.02363872528076172,0.01696467399597168,0.01643991470336914,0.016450166702270508,0.04605889320373535,0.07242536544799805,1.2843737602233887,0.40102243423461914,0.04433846473693848,0.06874871253967285,0.04335594177246094,0.06722664833068848,0.06950974464416504,0.06740713119506836,0.06617593765258789,0.06845903396606445,0.06637120246887207,0.07049202919006348,0.07038593292236328,0.06937050819396973,0.1011953353881836,0.09988689422607422,1.158473014831543,0.4483637809753418,0.06847119331359863,0.06630206108093262,0.06502532958984375,0.06698393821716309,0.06540775299072266 diff --git a/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv b/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv index d5c5b056a2..cbc14c3fa3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,True,True,Tests_passed,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,True,4,26,95,2,True,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,True,4,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,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,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,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,4398c7480130a1dea8871c1365433b813b3175b8ba367e0d6d695be62ec6356d,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,0.0382235050201416,0.041285037994384766,0.04309582710266113,0.013698816299438477,0.039926767349243164,0.04139566421508789,0.0397188663482666,0.1606442928314209,0.10721945762634277,0.8631172180175781,0.43057990074157715,0.028168201446533203,0.05199432373046875,0.02862405776977539,0.05199861526489258,0.0518341064453125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,True,True,Tests_passed,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,True,4,26,95,2,True,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,True,4,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,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,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,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,4398c7480130a1dea8871c1365433b813b3175b8ba367e0d6d695be62ec6356d,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,0.0382235050201416,0.041285037994384766,0.04309582710266113,0.013698816299438477,0.039926767349243164,0.04139566421508789,0.0397188663482666,0.1606442928314209,0.10721945762634277,0.8631172180175781,0.43057990074157715,0.028168201446533203,0.05199432373046875,0.02862405776977539,0.05199861526489258,0.0518341064453125,0.050931453704833984,0.05004715919494629,0.050742387771606445,0.04949522018432617,0.04975748062133789,0.04893922805786133,0.04989051818847656,0.08013105392456055,0.07894420623779297,0.853806734085083,0.46343994140625,0.05007028579711914,0.04967141151428223,0.04956555366516113,0.05099201202392578,0.05064058303833008 diff --git a/results/combined/merges_timed/irstv/cts.csv b/results/combined/merges_timed/irstv/cts.csv index bcd159fd1a..6f9abf6d0b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -91,refs/heads/master,990cb24e63345f9ff473362e308283a626e72e17,698fc384861d109ed05aef930922fb80dfa124c1,4e207705ef95c228d5755933efb06bd7195a35c3,,True,True,True,26,84,1483.0,2,True,26,Tests_passed,206fec35ec358f81b818dae2f7d9fd260b5ea47263dd9cc746ac6a47d68a932e,True,Tests_passed,cd06b045e376b9d1b7d401da659105725d83c420ba2cacf90dbf2a0951619fd6,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,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,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,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,89db67cdf93750836da0ff8e4c30f3faca2edeffd96cd0e59401cb81cce1bf37,Tests_failed,cb68b518a0470c5d2f00b1d35f89f0ef58d40d9e999cbc6dc89b65daf59443fb,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,0.03200817108154297,0.05356478691101074,0.021581411361694336,0.04422569274902344,0.04062962532043457,0.040743350982666016,0.06790971755981445,0.17893743515014648,0.09584689140319824,1.1030759811401367,0.6985068321228027,0.037856340408325195,0.09487199783325195,0.046051740646362305,0.09923696517944336,0.06788396835327148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +91,refs/heads/master,990cb24e63345f9ff473362e308283a626e72e17,698fc384861d109ed05aef930922fb80dfa124c1,4e207705ef95c228d5755933efb06bd7195a35c3,,True,True,True,26,84,1483.0,2,True,26,Tests_passed,206fec35ec358f81b818dae2f7d9fd260b5ea47263dd9cc746ac6a47d68a932e,True,Tests_passed,cd06b045e376b9d1b7d401da659105725d83c420ba2cacf90dbf2a0951619fd6,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,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,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,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,89db67cdf93750836da0ff8e4c30f3faca2edeffd96cd0e59401cb81cce1bf37,Tests_failed,cb68b518a0470c5d2f00b1d35f89f0ef58d40d9e999cbc6dc89b65daf59443fb,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,0.03200817108154297,0.05356478691101074,0.021581411361694336,0.04422569274902344,0.04062962532043457,0.040743350982666016,0.06790971755981445,0.17893743515014648,0.09584689140319824,1.1030759811401367,0.6985068321228027,0.037856340408325195,0.09487199783325195,0.046051740646362305,0.09923696517944336,0.06788396835327148,0.08989882469177246,0.06071352958679199,0.10150742530822754,0.06232810020446777,0.10458254814147949,0.06324362754821777,0.09961414337158203,0.10614800453186035,0.1357421875,1.1190667152404785,0.7260696887969971,0.06363892555236816,0.09490299224853516,0.06292319297790527,0.09162735939025879,0.07415461540222168 diff --git a/results/combined/merges_timed/iryndin/jdbf.csv b/results/combined/merges_timed/iryndin/jdbf.csv index 249f0ddc5f..2c75206d29 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,True,True,Tests_passed,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,True,10,41,365,2,True,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,True,10,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,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,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,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,21eb2b705bff16e174ada9795390310a957234850021f567efe8ba94c70e439b,Tests_failed,0f1ad0cf5694baad2260170d41fc38cc00fc49576d688850f6aa069fca100c81,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,0.04611325263977051,0.03927135467529297,0.04302048683166504,0.016043663024902344,0.04095005989074707,0.037192344665527344,0.041379451751708984,0.16588687896728516,0.10371971130371094,0.7254738807678223,0.3385894298553467,0.03193473815917969,0.056025028228759766,0.030436038970947266,0.05561017990112305,0.05648970603942871 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,True,True,Tests_passed,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,True,10,41,365,2,True,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,True,10,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,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,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,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,21eb2b705bff16e174ada9795390310a957234850021f567efe8ba94c70e439b,Tests_failed,0f1ad0cf5694baad2260170d41fc38cc00fc49576d688850f6aa069fca100c81,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,0.04611325263977051,0.03927135467529297,0.04302048683166504,0.016043663024902344,0.04095005989074707,0.037192344665527344,0.041379451751708984,0.16588687896728516,0.10371971130371094,0.7254738807678223,0.3385894298553467,0.03193473815917969,0.056025028228759766,0.030436038970947266,0.05561017990112305,0.05648970603942871,0.05229043960571289,0.05385327339172363,0.05444455146789551,0.05289459228515625,0.05338239669799805,0.0525052547454834,0.055299997329711914,0.08479881286621094,0.08565616607666016,0.7453494071960449,0.3601083755493164,0.052042484283447266,0.052695512771606445,0.053725242614746094,0.05375981330871582,0.052649497985839844 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 4e182da754..b5020a19d9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,True,5,25,580,2,True,5,Tests_passed,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,True,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,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,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,b00a99a12a6f8172af8150ad9c56c2ae24458d0d88ddf9e9415359501249308b,Tests_passed,75671deb28f7e9b3774e309307c56a4501c650ec2466111bdfbd496e2906d11c,Tests_passed,8edb2f7d84bd7adff35ebf554fca52a25f81264dd1c373d872df368c93ebfbbd,Tests_failed,e3cdba9b6d6eb0729d78d7b576090298b16609c61ebbcbccb8d97a4b9bb84afb,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,0.027547597885131836,0.04075980186462402,0.020996570587158203,0.016803741455078125,0.044681549072265625,0.04189252853393555,0.04377317428588867,0.17786026000976562,0.11283636093139648,1.569786787033081,0.540041446685791,0.043119192123413086,0.04644012451171875,0.04304075241088867,0.04545712471008301,0.04508471488952637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,True,5,25,580,2,True,5,Tests_passed,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,True,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,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,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,b00a99a12a6f8172af8150ad9c56c2ae24458d0d88ddf9e9415359501249308b,Tests_passed,75671deb28f7e9b3774e309307c56a4501c650ec2466111bdfbd496e2906d11c,Tests_passed,8edb2f7d84bd7adff35ebf554fca52a25f81264dd1c373d872df368c93ebfbbd,Tests_failed,e3cdba9b6d6eb0729d78d7b576090298b16609c61ebbcbccb8d97a4b9bb84afb,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,0.027547597885131836,0.04075980186462402,0.020996570587158203,0.016803741455078125,0.044681549072265625,0.04189252853393555,0.04377317428588867,0.17786026000976562,0.11283636093139648,1.569786787033081,0.540041446685791,0.043119192123413086,0.04644012451171875,0.04304075241088867,0.04545712471008301,0.04508471488952637,0.04561138153076172,0.046172380447387695,0.046767473220825195,0.04677271842956543,0.04609346389770508,0.0458674430847168,0.04633951187133789,0.07617020606994629,0.10942602157592773,1.5568656921386719,0.5988967418670654,0.04622316360473633,0.044893741607666016,0.04470944404602051,0.045960426330566406,0.046939849853515625 diff --git a/results/combined/merges_timed/j-easy/easy-rules.csv b/results/combined/merges_timed/j-easy/easy-rules.csv index 689716357c..ead3eb7392 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,True,21,47,688,9,True,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,True,25,True,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,6fea9e71ad7bada002aba69b755bfa4b6f75b93bff15f16bf40f432b5986cafb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,034a9a36ad49e8624ff30ca78707da688c5d28ff9ecf2c5e2297b343096a5928,Tests_failed,bd53c52c6d3dae4d47f26b2f28cbef3c9f940fb924f6e1f04a71d0e3608b4fa4,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.02001786231994629,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.28250789642333984,0.9429569244384766,0.47666096687316895,0.05539393424987793,0.11603617668151855,0.04584383964538574,0.11462903022766113,0.11466360092163086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,True,21,47,688,9,True,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,True,25,True,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,6fea9e71ad7bada002aba69b755bfa4b6f75b93bff15f16bf40f432b5986cafb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,034a9a36ad49e8624ff30ca78707da688c5d28ff9ecf2c5e2297b343096a5928,Tests_failed,bd53c52c6d3dae4d47f26b2f28cbef3c9f940fb924f6e1f04a71d0e3608b4fa4,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.02001786231994629,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.28250789642333984,0.9429569244384766,0.47666096687316895,0.05539393424987793,0.11603617668151855,0.04584383964538574,0.11462903022766113,0.11466360092163086,0.11135435104370117,0.10898542404174805,0.11470580101013184,0.11408638954162598,0.11347675323486328,0.11136341094970703,0.11223173141479492,0.19288206100463867,0.2185206413269043,0.9937281608581543,0.5805180072784424,0.11137914657592773,0.11113095283508301,0.11242222785949707,0.1142737865447998,0.11174201965332031 diff --git a/results/combined/merges_timed/j256/ormlite-core.csv b/results/combined/merges_timed/j256/ormlite-core.csv index 3a7cfe9571..4f491b5c23 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,True,74,554,2219,2,True,74,Tests_passed,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,True,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,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_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,20fc42555015c8eb603cfe7924a782cbed1844871b59c6457ba9b1d2f19c21a5,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_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,94d93d5578738086713cc5df1cde2716b6db0ac0b9645ff9221148273c14936c,Tests_failed,d8b75bf2bd80c8e24bf6974ec9690fa7a5f4ba2b1b722931b769179c8a65e55f,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,0.026480913162231445,0.05844736099243164,0.04557323455810547,0.03275322914123535,0.06304144859313965,0.04533743858337402,0.05710482597351074,0.12383866310119629,0.08004236221313477,1.6314959526062012,2.47906756401062,0.05992770195007324,0.09761261940002441,0.07578730583190918,0.09498906135559082,0.08301019668579102 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,True,74,554,2219,2,True,74,Tests_passed,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,True,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,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_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,20fc42555015c8eb603cfe7924a782cbed1844871b59c6457ba9b1d2f19c21a5,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_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,94d93d5578738086713cc5df1cde2716b6db0ac0b9645ff9221148273c14936c,Tests_failed,d8b75bf2bd80c8e24bf6974ec9690fa7a5f4ba2b1b722931b769179c8a65e55f,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,0.026480913162231445,0.05844736099243164,0.04557323455810547,0.03275322914123535,0.06304144859313965,0.04533743858337402,0.05710482597351074,0.12383866310119629,0.08004236221313477,1.6314959526062012,2.47906756401062,0.05992770195007324,0.09761261940002441,0.07578730583190918,0.09498906135559082,0.08301019668579102,0.08118414878845215,0.08200263977050781,0.08956718444824219,0.08667445182800293,0.0850830078125,0.0850675106048584,0.09949302673339844,0.129929780960083,0.12418794631958008,1.616642951965332,2.4482452869415283,0.11110782623291016,0.11302757263183594,0.1136934757232666,0.10900521278381348,0.11391615867614746 diff --git a/results/combined/merges_timed/j256/simplemagic.csv b/results/combined/merges_timed/j256/simplemagic.csv index 3c63faf9c1..e6df6109db 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,True,26,83,226,3,True,26,Tests_passed,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,True,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,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,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Tests_failed,50f85f927c2b3eb03a25d83363bb9823636dbcf875d1e4adc520c1af3ff54cfb,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,27544da93761fd83a71b272830d4b836a2545f08639c0006dd5e38dce3bff8f2,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,520fa17fa71f49d6da286b451d282fc2a564e3f7c8769197fe97fbab43c5f94f,Tests_failed,e9b01e53e4183482a9381e5ca7b7cc7595d1abdd6d71dca784b72d918743bb02,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,0.05699634552001953,0.05351710319519043,0.05451250076293945,0.03934216499328613,0.03970956802368164,0.03172779083251953,0.04961133003234863,0.21127533912658691,0.18195581436157227,1.95851469039917,0.6865603923797607,0.07268738746643066,0.07871079444885254,0.07725000381469727,0.09810543060302734,0.1009523868560791 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,True,26,83,226,3,True,26,Tests_passed,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,True,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,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,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Tests_failed,50f85f927c2b3eb03a25d83363bb9823636dbcf875d1e4adc520c1af3ff54cfb,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,27544da93761fd83a71b272830d4b836a2545f08639c0006dd5e38dce3bff8f2,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,520fa17fa71f49d6da286b451d282fc2a564e3f7c8769197fe97fbab43c5f94f,Tests_failed,e9b01e53e4183482a9381e5ca7b7cc7595d1abdd6d71dca784b72d918743bb02,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,0.05699634552001953,0.05351710319519043,0.05451250076293945,0.03934216499328613,0.03970956802368164,0.03172779083251953,0.04961133003234863,0.21127533912658691,0.18195581436157227,1.95851469039917,0.6865603923797607,0.07268738746643066,0.07871079444885254,0.07725000381469727,0.09810543060302734,0.1009523868560791,0.09444785118103027,0.09241890907287598,0.07712244987487793,0.09845757484436035,0.09915542602539062,0.0760354995727539,0.09455585479736328,0.15074443817138672,0.16684317588806152,2.014842987060547,0.746345043182373,0.09127640724182129,0.0762486457824707,0.09276938438415527,0.09294462203979492,0.08975982666015625 diff --git a/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv b/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv index e85dd17c15..ae2263d4eb 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,True,False,Tests_passed,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,True,2,4,15,2,True,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,True,2,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,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,Merge_failed,54a1fb72f517018e6664e34beffcabe0376af79166c230c3878dcec27e399e54,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,91e82c3a82e632856a796581f75a2bc91a6b126f3c258c8ffd53ff96488b665b,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,9804d22eacd0a59db03133643fa64a61a7b73d60de81e1b4939aa819d7ab5143,Tests_failed,a1fd7fa55772aedd1a886566aa423927be1536a30172af70f59465f45f3356a4,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,0.037369728088378906,0.03659868240356445,0.03562474250793457,0.011918067932128906,0.03455686569213867,0.035147666931152344,0.032985687255859375,0.14992022514343262,0.11929845809936523,0.5494441986083984,0.23946642875671387,0.03773617744445801,0.03964424133300781,0.03760170936584473,0.03946995735168457,0.03856039047241211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,True,False,Tests_passed,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,True,2,4,15,2,True,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,True,2,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,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,Merge_failed,54a1fb72f517018e6664e34beffcabe0376af79166c230c3878dcec27e399e54,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,91e82c3a82e632856a796581f75a2bc91a6b126f3c258c8ffd53ff96488b665b,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,9804d22eacd0a59db03133643fa64a61a7b73d60de81e1b4939aa819d7ab5143,Tests_failed,a1fd7fa55772aedd1a886566aa423927be1536a30172af70f59465f45f3356a4,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,0.037369728088378906,0.03659868240356445,0.03562474250793457,0.011918067932128906,0.03455686569213867,0.035147666931152344,0.032985687255859375,0.14992022514343262,0.11929845809936523,0.5494441986083984,0.23946642875671387,0.03773617744445801,0.03964424133300781,0.03760170936584473,0.03946995735168457,0.03856039047241211,0.037911176681518555,0.03856992721557617,0.03797793388366699,0.038077592849731445,0.038004159927368164,0.03698325157165527,0.03767085075378418,0.06888723373413086,0.07569289207458496,0.5794410705566406,0.2842118740081787,0.03773021697998047,0.03838038444519043,0.038309335708618164,0.038213253021240234,0.037778377532958984 diff --git a/results/combined/merges_timed/jadler-mocking/jadler.csv b/results/combined/merges_timed/jadler-mocking/jadler.csv index e9faf4d3c2..c50abbd47f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,True,17,103,249,3,True,17,Tests_passed,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,True,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,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,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,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,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,c5df4f0dc07232dfb9206add8c912d8d9e450cad20ea04736c41e996ae298eec,Tests_failed,c61300278237540ae0acb1f0a0b23a65808764ebef150914697e8f84a7a87cca,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,0.04296088218688965,0.048613786697387695,0.041870832443237305,0.0198214054107666,0.051183223724365234,0.05663657188415527,0.03187394142150879,0.23544764518737793,0.17304658889770508,2.0450124740600586,0.718571662902832,0.03715038299560547,0.08578014373779297,0.03674173355102539,0.08566880226135254,0.08733749389648438 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,True,17,103,249,3,True,17,Tests_passed,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,True,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,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,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,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,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,c5df4f0dc07232dfb9206add8c912d8d9e450cad20ea04736c41e996ae298eec,Tests_failed,c61300278237540ae0acb1f0a0b23a65808764ebef150914697e8f84a7a87cca,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,0.04296088218688965,0.048613786697387695,0.041870832443237305,0.0198214054107666,0.051183223724365234,0.05663657188415527,0.03187394142150879,0.23544764518737793,0.17304658889770508,2.0450124740600586,0.718571662902832,0.03715038299560547,0.08578014373779297,0.03674173355102539,0.08566880226135254,0.08733749389648438,0.08087968826293945,0.08298993110656738,0.0849618911743164,0.08199477195739746,0.08306694030761719,0.08347773551940918,0.08338141441345215,0.1351299285888672,0.13466429710388184,2.0938477516174316,0.7558262348175049,0.08265113830566406,0.08119058609008789,0.08299803733825684,0.08257150650024414,0.08047056198120117 diff --git a/results/combined/merges_timed/jahia/jahiapp-newsletter.csv b/results/combined/merges_timed/jahia/jahiapp-newsletter.csv index 9d850663dd..dd2ddccad5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,,True,27,170,,5,True,27,Tests_passed,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,True,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,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,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Merge_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,1f72763104ac30687371713238829ef3c0c442b15254be966fa2c2ea928959a4,Tests_passed,3a2e16f9dd08352ef6336c2eb771e05505e4b2b53ecb2d3ae3aa0fd6d308449e,Merge_failed,bbfc4e3d7bbfc5e2c54ab4f42d4dbdcad55616b501bb9fbbfd9fc35e2974209e,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,0.054849863052368164,0.059256553649902344,0.053967952728271484,0.020247936248779297,0.04831361770629883,0.044969797134399414,0.05103492736816406,0.38352465629577637,0.2885274887084961,2.4682652950286865,0.45784878730773926,0.056444406509399414,0.1125180721282959,0.047498464584350586,0.11079001426696777,0.11417055130004883 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,,True,27,170,,5,True,27,Tests_passed,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,True,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,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,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Merge_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,1f72763104ac30687371713238829ef3c0c442b15254be966fa2c2ea928959a4,Tests_passed,3a2e16f9dd08352ef6336c2eb771e05505e4b2b53ecb2d3ae3aa0fd6d308449e,Merge_failed,bbfc4e3d7bbfc5e2c54ab4f42d4dbdcad55616b501bb9fbbfd9fc35e2974209e,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,Merge_failed,161e3ec312ab4d02fc63d14b4a6fa51068c833fef3df74cbfee441ba9d2af6c5,0.054849863052368164,0.059256553649902344,0.053967952728271484,0.020247936248779297,0.04831361770629883,0.044969797134399414,0.05103492736816406,0.38352465629577637,0.2885274887084961,2.4682652950286865,0.45784878730773926,0.056444406509399414,0.1125180721282959,0.047498464584350586,0.11079001426696777,0.11417055130004883,0.10529351234436035,0.1061258316040039,0.10815262794494629,0.1087188720703125,0.10739922523498535,0.10821914672851562,0.10593891143798828,0.19142913818359375,0.23244166374206543,2.558171272277832,0.5545940399169922,0.10483098030090332,0.10558629035949707,0.10580039024353027,0.1063685417175293,0.10646343231201172 diff --git a/results/combined/merges_timed/jahia/ldap-provider.csv b/results/combined/merges_timed/jahia/ldap-provider.csv index 2e2163bcc6..80badc0752 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,True,20,40,311.0,8,True,20,Tests_passed,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,True,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,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,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,e2ce6272889283f47d21e5dab1a0c5a36576bf1cf4fc09509fe4ee751b9e6432,Tests_failed,0a74a37ee84b51f8da04b5a75ad769ab51baa74f8bfd1d1d8a8f0f629371c8ff,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,0.05159449577331543,0.05508852005004883,0.052304983139038086,0.020678043365478516,0.05254006385803223,0.054680824279785156,0.03461956977844238,0.5817611217498779,0.44027137756347656,5.28517746925354,0.5296893119812012,0.034838199615478516,0.184798002243042,0.03643012046813965,0.18310952186584473,0.18958592414855957 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,True,20,40,311.0,8,True,20,Tests_passed,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,True,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,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,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,e2ce6272889283f47d21e5dab1a0c5a36576bf1cf4fc09509fe4ee751b9e6432,Tests_failed,0a74a37ee84b51f8da04b5a75ad769ab51baa74f8bfd1d1d8a8f0f629371c8ff,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,8bd18e9322a2f4ad3797216506074feef97a84012b88bd45208c2eafa14d4d8a,Tests_passed,9434dba688f7bbe2cb851ce696a3045701d71f31ae5d375396b46a34c49168be,0.05159449577331543,0.05508852005004883,0.052304983139038086,0.020678043365478516,0.05254006385803223,0.054680824279785156,0.03461956977844238,0.5817611217498779,0.44027137756347656,5.28517746925354,0.5296893119812012,0.034838199615478516,0.184798002243042,0.03643012046813965,0.18310952186584473,0.18958592414855957,0.17246794700622559,0.17486977577209473,0.17400074005126953,0.1737375259399414,0.17214536666870117,0.17094111442565918,0.17412400245666504,0.3062930107116699,0.34689807891845703,5.519992113113403,0.5647468566894531,0.17265558242797852,0.17237257957458496,0.17075800895690918,0.17257261276245117,0.1727292537689209 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 8e5f15541a..6227875b71 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,True,False,Tests_passed,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,True,5,16,137.0,2,True,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,True,5,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,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,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,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,c870f7cfcca1687e3d5aba7e8c3e5c9d352c55e8c35787dffb8e890d4e0af5e5,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,0.014681816101074219,0.01370096206665039,0.0455479621887207,0.04704761505126953,0.05440044403076172,0.0403902530670166,0.04516720771789551,0.17305588722229004,0.11059308052062988,1.6621532440185547,0.4531722068786621,0.03272080421447754,0.0901036262512207,0.07743263244628906,0.1014866828918457,0.08939552307128906 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,True,False,Tests_passed,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,True,5,16,137.0,2,True,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,True,5,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,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,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,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,c870f7cfcca1687e3d5aba7e8c3e5c9d352c55e8c35787dffb8e890d4e0af5e5,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,0.014681816101074219,0.01370096206665039,0.0455479621887207,0.04704761505126953,0.05440044403076172,0.0403902530670166,0.04516720771789551,0.17305588722229004,0.11059308052062988,1.6621532440185547,0.4531722068786621,0.03272080421447754,0.0901036262512207,0.07743263244628906,0.1014866828918457,0.08939552307128906,0.10473227500915527,0.10049653053283691,0.09863591194152832,0.09134745597839355,0.07165241241455078,0.07163000106811523,0.06349825859069824,0.16790318489074707,0.14319753646850586,1.7904787063598633,0.5189449787139893,0.10133028030395508,0.10663080215454102,0.10160565376281738,0.08901214599609375,0.09211182594299316 diff --git a/results/combined/merges_timed/jakewharton/disklrucache.csv b/results/combined/merges_timed/jakewharton/disklrucache.csv index ed4a597ab5..0ad7b18358 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,3,15,135,2,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,3,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,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,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,f3255a5b9d7dbebc3c826b1ed7e89e5b33ffeb5ac66846697dbd6b69af251414,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.017060279846191406,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.06444120407104492,1.2582242488861084,0.45715808868408203,0.030770301818847656,0.05980730056762695,0.03103184700012207,0.05956745147705078,0.06189298629760742 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,3,15,135,2,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,3,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,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,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,f3255a5b9d7dbebc3c826b1ed7e89e5b33ffeb5ac66846697dbd6b69af251414,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.017060279846191406,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.06444120407104492,1.2582242488861084,0.45715808868408203,0.030770301818847656,0.05980730056762695,0.03103184700012207,0.05956745147705078,0.06189298629760742,0.056654930114746094,0.0583033561706543,0.05721926689147949,0.05634617805480957,0.05671858787536621,0.05601954460144043,0.05628252029418945,0.0885317325592041,0.08879232406616211,1.3240323066711426,0.4887537956237793,0.05747556686401367,0.05690288543701172,0.0541684627532959,0.05581045150756836,0.058687448501586914 diff --git a/results/combined/merges_timed/jalkanen/speed4j.csv b/results/combined/merges_timed/jalkanen/speed4j.csv index e85b367a04..49fc05e4a5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,True,5,13,69,2,True,5,Tests_passed,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,True,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,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,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,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,a9299bd2c83d64f9ad03c62ded4d296ec0581d6616fe6dd5cbb0e83506fa89b7,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,0.04560399055480957,0.03528952598571777,0.046416282653808594,0.015845060348510742,0.044886112213134766,0.0415501594543457,0.041994571685791016,0.15654754638671875,0.10333728790283203,0.9643926620483398,0.2996549606323242,0.03123188018798828,0.05764293670654297,0.03085470199584961,0.0569002628326416,0.058014869689941406 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,True,5,13,69,2,True,5,Tests_passed,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,True,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,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,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,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,a9299bd2c83d64f9ad03c62ded4d296ec0581d6616fe6dd5cbb0e83506fa89b7,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,0.04560399055480957,0.03528952598571777,0.046416282653808594,0.015845060348510742,0.044886112213134766,0.0415501594543457,0.041994571685791016,0.15654754638671875,0.10333728790283203,0.9643926620483398,0.2996549606323242,0.03123188018798828,0.05764293670654297,0.03085470199584961,0.0569002628326416,0.058014869689941406,0.05433487892150879,0.05386066436767578,0.05183720588684082,0.05711555480957031,0.055002689361572266,0.05265045166015625,0.056507110595703125,0.08607292175292969,0.08439254760742188,0.9808578491210938,0.3279294967651367,0.055576324462890625,0.055533647537231445,0.054125070571899414,0.053919076919555664,0.055055856704711914 diff --git a/results/combined/merges_timed/japgolly/svg-android.csv b/results/combined/merges_timed/japgolly/svg-android.csv index cb4fb7a74c..1fca966f28 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,True,False,Tests_passed,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,True,2,8,17,2,True,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,True,2,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,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,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,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,2ec92a44ec068989a6b5c6272138dff7c2613a136fb6f2765026e86b5094ca2c,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,0.038013458251953125,0.039113521575927734,0.04605889320373535,0.016768932342529297,0.04726696014404297,0.045317888259887695,0.048024892807006836,0.17112231254577637,0.11464619636535645,2.1485700607299805,0.4846351146697998,0.03420710563659668,0.06397414207458496,0.034935951232910156,0.06335830688476562,0.06410431861877441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,True,False,Tests_passed,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,True,2,8,17,2,True,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,True,2,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,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,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,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,2ec92a44ec068989a6b5c6272138dff7c2613a136fb6f2765026e86b5094ca2c,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,0.038013458251953125,0.039113521575927734,0.04605889320373535,0.016768932342529297,0.04726696014404297,0.045317888259887695,0.048024892807006836,0.17112231254577637,0.11464619636535645,2.1485700607299805,0.4846351146697998,0.03420710563659668,0.06397414207458496,0.034935951232910156,0.06335830688476562,0.06410431861877441,0.06051206588745117,0.06018877029418945,0.06310868263244629,0.06132936477661133,0.06007957458496094,0.06095075607299805,0.06285691261291504,0.09434008598327637,0.0921173095703125,2.0444436073303223,0.5145361423492432,0.059490203857421875,0.06058025360107422,0.06047177314758301,0.06146955490112305,0.06066775321960449 diff --git a/results/combined/merges_timed/jasig/java-cas-client.csv b/results/combined/merges_timed/jasig/java-cas-client.csv index 31fe16d15b..a7effc4643 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -625,refs/remotes/origin/pull/65,f9dba228c432bb86dec5f92f7ae748d86c69b380,632377865559774569a2b0360cf5049146484bdf,affe0d30f1ce16e15399f30f1e5faa6ea878094c,,True,True,True,3,14,89.0,2,True,3,Tests_passed,7448b189c00609ac5e1320f51ac9a7479f2ac5a6b67f6040598fe79ae4217039,True,Tests_passed,27abde5006d5f40fd0a3771a9de7f04f888cb1a3af8444917e79eee115092aa2,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,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,17ac687484ea4941fc304aa82586e9a471758be1f7087f6e5abcb51b9bd367c8,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,4e29d84444279bd46210dd0b53ceb7f80918c3c89db37af842c72b3015fd599a,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,b60e6244f5c096fd9851325d4aa4671855b346e78e93ca60e227fc01a5c56a7f,Tests_failed,9f7fb1b1b798aed4814becacafc98e11b7fde56516c08ce373958b6cf9ede139,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,0.03224921226501465,0.033394575119018555,0.02044200897216797,0.02240610122680664,0.013330936431884766,0.01345372200012207,0.017484664916992188,0.09514045715332031,0.09670042991638184,0.7725253105163574,0.30945444107055664,0.0521695613861084,0.042471885681152344,0.051651954650878906,0.052626848220825195,0.05853986740112305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +625,refs/remotes/origin/pull/65,f9dba228c432bb86dec5f92f7ae748d86c69b380,632377865559774569a2b0360cf5049146484bdf,affe0d30f1ce16e15399f30f1e5faa6ea878094c,,True,True,True,3,14,89.0,2,True,3,Tests_passed,7448b189c00609ac5e1320f51ac9a7479f2ac5a6b67f6040598fe79ae4217039,True,Tests_passed,27abde5006d5f40fd0a3771a9de7f04f888cb1a3af8444917e79eee115092aa2,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,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,17ac687484ea4941fc304aa82586e9a471758be1f7087f6e5abcb51b9bd367c8,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,4e29d84444279bd46210dd0b53ceb7f80918c3c89db37af842c72b3015fd599a,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,b60e6244f5c096fd9851325d4aa4671855b346e78e93ca60e227fc01a5c56a7f,Tests_failed,9f7fb1b1b798aed4814becacafc98e11b7fde56516c08ce373958b6cf9ede139,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Tests_passed,e5943ed04ad5681d821cadde4d85da008d2cf38ec669aef7a0ccaee3cdaf9478,0.03224921226501465,0.033394575119018555,0.02044200897216797,0.02240610122680664,0.013330936431884766,0.01345372200012207,0.017484664916992188,0.09514045715332031,0.09670042991638184,0.7725253105163574,0.30945444107055664,0.0521695613861084,0.042471885681152344,0.051651954650878906,0.052626848220825195,0.05853986740112305,0.04804563522338867,0.054802656173706055,0.05047130584716797,0.06880903244018555,0.04699397087097168,0.05009341239929199,0.051039695739746094,0.0857088565826416,0.08333563804626465,0.801154375076294,0.3484153747558594,0.04794669151306152,0.04934883117675781,0.04947638511657715,0.052324533462524414,0.055840492248535156 diff --git a/results/combined/merges_timed/jasig/jspc-maven-plugin.csv b/results/combined/merges_timed/jasig/jspc-maven-plugin.csv index ba6a982136..17c4827fcc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,True,False,True,5,8,24,2,True,5,Tests_passed,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,True,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,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,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,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,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,43962285f48f593786e153a7b09599373867f556a7df1bbc10d9a2a88ffb4a60,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,0.04670357704162598,0.0517728328704834,0.04662728309631348,0.018297195434570312,0.05329418182373047,0.04506230354309082,0.04481649398803711,0.17440128326416016,0.1082310676574707,1.1401293277740479,0.316866397857666,0.03737998008728027,0.06337213516235352,0.037902116775512695,0.06307864189147949,0.06175374984741211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,True,False,True,5,8,24,2,True,5,Tests_passed,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,True,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,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,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,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,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,43962285f48f593786e153a7b09599373867f556a7df1bbc10d9a2a88ffb4a60,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,0.04670357704162598,0.0517728328704834,0.04662728309631348,0.018297195434570312,0.05329418182373047,0.04506230354309082,0.04481649398803711,0.17440128326416016,0.1082310676574707,1.1401293277740479,0.316866397857666,0.03737998008728027,0.06337213516235352,0.037902116775512695,0.06307864189147949,0.06175374984741211,0.060584306716918945,0.06165647506713867,0.0626225471496582,0.06187748908996582,0.062413930892944336,0.06239652633666992,0.06141376495361328,0.09601807594299316,0.09501194953918457,1.164566993713379,0.3533051013946533,0.060723066329956055,0.06133699417114258,0.05965900421142578,0.060471534729003906,0.06189417839050293 diff --git a/results/combined/merges_timed/jasig/webproxyportlet.csv b/results/combined/merges_timed/jasig/webproxyportlet.csv index 3c44874573..0fc58027e3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,True,13,47,175,3,True,13,Tests_passed,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,True,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,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,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,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,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,f77504af3d13f7616e31f1b0e0a59c335d1ce48cb7c2297ec5160a60b927a029,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,0.01503133773803711,0.015896320343017578,0.01881098747253418,0.029205322265625,0.018970966339111328,0.01872706413269043,0.01799798011779785,0.05901050567626953,0.12258338928222656,0.7425084114074707,0.4026830196380615,0.050328969955444336,0.09777641296386719,0.04636812210083008,0.09455156326293945,0.09225654602050781 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,True,13,47,175,3,True,13,Tests_passed,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,True,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,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,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,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,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,f77504af3d13f7616e31f1b0e0a59c335d1ce48cb7c2297ec5160a60b927a029,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,0.01503133773803711,0.015896320343017578,0.01881098747253418,0.029205322265625,0.018970966339111328,0.01872706413269043,0.01799798011779785,0.05901050567626953,0.12258338928222656,0.7425084114074707,0.4026830196380615,0.050328969955444336,0.09777641296386719,0.04636812210083008,0.09455156326293945,0.09225654602050781,0.09123659133911133,0.08954310417175293,0.09096980094909668,0.09298014640808105,0.09534907341003418,0.08037519454956055,0.09446287155151367,0.15086746215820312,0.13156461715698242,0.8239398002624512,0.45952844619750977,0.09109115600585938,0.09147787094116211,0.07744431495666504,0.09030771255493164,0.09336709976196289 diff --git a/results/combined/merges_timed/javamoney/jsr354-api.csv b/results/combined/merges_timed/javamoney/jsr354-api.csv index 6dfde37c81..4667ecda6f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -142,refs/heads/master,7422197487f7fb1c43111c98d9859e9c05052566,668d6eb9dd831ffaa0a5f20dd9f34f6e54eb8a08,73a0bfe83fe56f264293476ce262a774c7b7fc1f,,True,True,True,31,144,1603,3,True,31,Tests_passed,6ab3a9b711d74ef199aa3f1233e5fe391abd67eb68b492cb73f83c29a476a9cb,True,Tests_passed,4630f11d26138b665e413ef8871fafadc2b6ecc7179c43278a1de0a05d709754,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,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,f349d2be4e2e7c61cfe9a842b02987df7a52cdf522a785fdb9de301bb617bca6,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,1832be1a364ad011ce1408b2741ad8a22da29fef51338434d60908d2a64fd5a1,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,03dbd052dab49e171c4a7866baa6402ab66b7efac89571cf7c7c498036b53f84,Merge_timedout,,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,0.05078554153442383,0.03864741325378418,0.03853631019592285,0.030530691146850586,0.047943115234375,0.04834246635437012,0.04894566535949707,0.2437889575958252,0.16870665550231934,1.0454826354980469,-1.0,0.10068130493164062,0.058950185775756836,0.059316396713256836,0.06090664863586426,0.09844970703125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +142,refs/heads/master,7422197487f7fb1c43111c98d9859e9c05052566,668d6eb9dd831ffaa0a5f20dd9f34f6e54eb8a08,73a0bfe83fe56f264293476ce262a774c7b7fc1f,,True,True,True,31,144,1603,3,True,31,Tests_passed,6ab3a9b711d74ef199aa3f1233e5fe391abd67eb68b492cb73f83c29a476a9cb,True,Tests_passed,4630f11d26138b665e413ef8871fafadc2b6ecc7179c43278a1de0a05d709754,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,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,f349d2be4e2e7c61cfe9a842b02987df7a52cdf522a785fdb9de301bb617bca6,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,1832be1a364ad011ce1408b2741ad8a22da29fef51338434d60908d2a64fd5a1,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,03dbd052dab49e171c4a7866baa6402ab66b7efac89571cf7c7c498036b53f84,Merge_timedout,,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,5e6525bb74faeb148df8ed87ec015828cf915b03baa87cbc2d42bfc4d89177b0,0.05078554153442383,0.03864741325378418,0.03853631019592285,0.030530691146850586,0.047943115234375,0.04834246635437012,0.04894566535949707,0.2437889575958252,0.16870665550231934,1.0454826354980469,-1.0,0.10068130493164062,0.058950185775756836,0.059316396713256836,0.06090664863586426,0.09844970703125,0.06919097900390625,0.08838105201721191,0.06874489784240723,0.1031489372253418,0.0682523250579834,0.07129979133605957,0.06840968132019043,0.12306547164916992,0.13576984405517578,1.2629790306091309,-1.0,0.06704473495483398,0.06726646423339844,0.06764698028564453,0.0681602954864502,0.09217166900634766 diff --git a/results/combined/merges_timed/javamoney/jsr354-ri.csv b/results/combined/merges_timed/javamoney/jsr354-ri.csv index 61d140f7d9..cd218c59d1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,True,False,Tests_passed,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,True,2,7,20,2,True,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,True,2,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,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,fb8bb327054653366a3470bb456548f9def7935387f60b9ac29c1d122dbe3d21,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Tests_failed,e4e75218f1b8df948f4bc63b9906280941108ffdbaa1ffad49bbddbc1ae77364,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,0.010616779327392578,0.030515193939208984,0.009700775146484375,0.06121468544006348,0.04014849662780762,0.009653806686401367,0.010231733322143555,0.10180521011352539,0.12202334403991699,0.7209763526916504,0.2947964668273926,0.04006648063659668,0.09884428977966309,0.040487051010131836,0.09450030326843262,0.0423121452331543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,True,False,Tests_passed,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,True,2,7,20,2,True,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,True,2,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,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,fb8bb327054653366a3470bb456548f9def7935387f60b9ac29c1d122dbe3d21,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Tests_failed,e4e75218f1b8df948f4bc63b9906280941108ffdbaa1ffad49bbddbc1ae77364,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,0.010616779327392578,0.030515193939208984,0.009700775146484375,0.06121468544006348,0.04014849662780762,0.009653806686401367,0.010231733322143555,0.10180521011352539,0.12202334403991699,0.7209763526916504,0.2947964668273926,0.04006648063659668,0.09884428977966309,0.040487051010131836,0.09450030326843262,0.0423121452331543,0.04235076904296875,0.10453438758850098,0.04225587844848633,0.1088259220123291,0.042838335037231445,0.11045122146606445,0.04193425178527832,0.15198397636413574,0.09429764747619629,0.862673282623291,0.34731483459472656,0.04248809814453125,0.0939168930053711,0.0848989486694336,0.09157514572143555,0.09843802452087402 diff --git a/results/combined/merges_timed/javaparser/javaparser.csv b/results/combined/merges_timed/javaparser/javaparser.csv index 1c3930f888..acf015dd73 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,Tests_passed,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,True,342,2186,12572.0,3,True,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,True,342,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,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Tests_failed,ef223416d8c6f4e51fd9454ccd0444011894c38d0b38c47b21832ff86d8b2a66,Tests_passed,2b9496f512da9734b80318c05abc0542743c28a49331c29b54e1f14ef5f03cf9,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,d6ec22f8f63954d6a0c0d527d93409a4ac665544b92f125916e2f3d025792702,Merge_failed,24507c05e96bc7525f8c67fed96e667d58e92470fa413bbf460df2aae3042aa9,Tests_passed,eb9cac0244d0f37b3be0a75daa461e0f563fbc3568d7c66da791405feeb3261f,Tests_failed,b86746da1c3be283a4fc17777608d45266db97474a5135c2bd7f9395f03b5cdd,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.0782620906829834,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1680011749267578,1.9098291397094727,7.089571952819824,0.16917753219604492,0.1474602222442627,0.1215364933013916,0.14760565757751465,0.15126562118530273 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,Tests_passed,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,True,342,2186,12572.0,3,True,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,True,342,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,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Tests_failed,ef223416d8c6f4e51fd9454ccd0444011894c38d0b38c47b21832ff86d8b2a66,Tests_passed,2b9496f512da9734b80318c05abc0542743c28a49331c29b54e1f14ef5f03cf9,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,d6ec22f8f63954d6a0c0d527d93409a4ac665544b92f125916e2f3d025792702,Merge_failed,24507c05e96bc7525f8c67fed96e667d58e92470fa413bbf460df2aae3042aa9,Tests_passed,eb9cac0244d0f37b3be0a75daa461e0f563fbc3568d7c66da791405feeb3261f,Tests_failed,b86746da1c3be283a4fc17777608d45266db97474a5135c2bd7f9395f03b5cdd,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,33ebb46846554598a634196c04823ec38970e417bc97b30e3965ea4ab675849a,Merge_failed,c8e911f6a770792f60b345e53133c3c8982b4aff60dff1447bd26799b8db5b58,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.0782620906829834,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1680011749267578,1.9098291397094727,7.089571952819824,0.16917753219604492,0.1474602222442627,0.1215364933013916,0.14760565757751465,0.15126562118530273,0.1489856243133545,0.15248990058898926,0.15625286102294922,0.16183757781982422,0.15815186500549316,0.15842270851135254,0.15497946739196777,0.23230552673339844,0.2320692539215088,2.3343842029571533,7.805521011352539,0.15447068214416504,0.15313029289245605,0.14584064483642578,0.1486828327178955,0.14726877212524414 diff --git a/results/combined/merges_timed/javasoze/clue.csv b/results/combined/merges_timed/javasoze/clue.csv index bbc61634a9..d84e7bc3c8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,True,True,True,28,149,952,5,True,28,Tests_passed,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,True,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,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,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,5fea6eeb12e6c1d38240f44951764a09948cb5c49b78534b0fcfd199f075ab0f,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,56e4bb531b792d8d1f588bac3ff8d4387acc084d8d3ec9679573b1a98c60269d,Merge_failed,f164c397caf7ab9785754e82e0a888a9a78d08d2c1003f59623ba964e02c9118,Tests_failed,9eb743facbdefefcd5840c7a1bfe1e5aae345b9868f8575f33c7135d74a01496,Tests_failed,70732895b82e589e703f7018db3483c096911f5f56a8dbcde5d20f656059fce6,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,0.04320573806762695,0.05829572677612305,0.04492664337158203,0.06003403663635254,0.03960061073303223,0.05060720443725586,0.06011557579040527,0.2890639305114746,0.2709975242614746,1.9891140460968018,0.6535544395446777,0.10233449935913086,0.1759655475616455,0.08818984031677246,0.1632080078125,0.16476821899414062 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,True,True,True,28,149,952,5,True,28,Tests_passed,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,True,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,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,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,5fea6eeb12e6c1d38240f44951764a09948cb5c49b78534b0fcfd199f075ab0f,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,56e4bb531b792d8d1f588bac3ff8d4387acc084d8d3ec9679573b1a98c60269d,Merge_failed,f164c397caf7ab9785754e82e0a888a9a78d08d2c1003f59623ba964e02c9118,Tests_failed,9eb743facbdefefcd5840c7a1bfe1e5aae345b9868f8575f33c7135d74a01496,Tests_failed,70732895b82e589e703f7018db3483c096911f5f56a8dbcde5d20f656059fce6,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,385a0e9408b7ebf749be9a8a8c37f3e41fe7475a1b2334f44793e9bdc4493805,Merge_failed,6c0c42dd27007e3d90f397e0c413fdf0934a445e9c6d050b7fedd52ec8fc5dfd,0.04320573806762695,0.05829572677612305,0.04492664337158203,0.06003403663635254,0.03960061073303223,0.05060720443725586,0.06011557579040527,0.2890639305114746,0.2709975242614746,1.9891140460968018,0.6535544395446777,0.10233449935913086,0.1759655475616455,0.08818984031677246,0.1632080078125,0.16476821899414062,0.15984082221984863,0.15622735023498535,0.17006683349609375,0.17128229141235352,0.16582441329956055,0.16737890243530273,0.17468667030334473,0.27791619300842285,0.28608179092407227,2.2200045585632324,0.8393411636352539,0.1618185043334961,0.1630551815032959,0.16274476051330566,0.16404199600219727,0.16438722610473633 diff --git a/results/combined/merges_timed/javen205/ijpay.csv b/results/combined/merges_timed/javen205/ijpay.csv index 5801133a68..76397e03e6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,True,136,274,10642,2,True,136,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,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,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_failed,fef54fb88648ec223b6dbf3d01bc06ceb8419acafe99490dbac92e212d48563c,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,c8e987c7fe09ddf26c5833a5f7c5781ec6053d6cbf27de38774e2377775716a5,Tests_failed,b9a4ede99c22e7af061cda3dffb893cdb71b2e8a48b0f94e50c5a35212fc7f25,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.033136606216430664,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.0994865894317627,0.9691572189331055,1.4477860927581787,0.0594940185546875,0.08665609359741211,0.059935569763183594,0.0840156078338623,0.08754873275756836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,True,136,274,10642,2,True,136,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,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,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_failed,fef54fb88648ec223b6dbf3d01bc06ceb8419acafe99490dbac92e212d48563c,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,c8e987c7fe09ddf26c5833a5f7c5781ec6053d6cbf27de38774e2377775716a5,Tests_failed,b9a4ede99c22e7af061cda3dffb893cdb71b2e8a48b0f94e50c5a35212fc7f25,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,Tests_passed,f0644d202f5fbe26269c73aff504c98de8af869221c4910a306287902160db61,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.033136606216430664,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.0994865894317627,0.9691572189331055,1.4477860927581787,0.0594940185546875,0.08665609359741211,0.059935569763183594,0.0840156078338623,0.08754873275756836,0.08304691314697266,0.08037638664245605,0.08254575729370117,0.08893799781799316,0.08741426467895508,0.08189749717712402,0.08545351028442383,0.12970304489135742,0.11866164207458496,0.9625756740570068,1.481736421585083,0.08110189437866211,0.08498287200927734,0.08230829238891602,0.08403468132019043,0.08332276344299316 diff --git a/results/combined/merges_timed/jayway/awaitility.csv b/results/combined/merges_timed/jayway/awaitility.csv index 56f89b686b..83329d93c0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,Merge_failed,f1a069ee855e8c0365d39830178c548b82278bacbb19cae35b96604b4b1ce520,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,d7c9e36d83684d00a9cc4ffe2bd28a9393c33b58cc78312af1473881e60fce45,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_timedout,920ff4b4a9edb84a335987e199c587bda2f158572129076107ffec95fac75ad8,,,,,,,,,,,,,0.013469696044921875,0.012835502624511719,0.013617277145385742,0.014024019241333008,0.013714790344238281,0.013603687286376953,0.013615131378173828,0.05480360984802246,0.12537741661071777,1.1494598388671875,0.30326342582702637,0.05162930488586426,0.07205748558044434,0.04858040809631348,0.0750119686126709,0.0660245418548584 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,Merge_failed,f1a069ee855e8c0365d39830178c548b82278bacbb19cae35b96604b4b1ce520,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,d7c9e36d83684d00a9cc4ffe2bd28a9393c33b58cc78312af1473881e60fce45,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_timedout,920ff4b4a9edb84a335987e199c587bda2f158572129076107ffec95fac75ad8,,,,,,,,,,,,,0.013469696044921875,0.012835502624511719,0.013617277145385742,0.014024019241333008,0.013714790344238281,0.013603687286376953,0.013615131378173828,0.05480360984802246,0.12537741661071777,1.1494598388671875,0.30326342582702637,0.05162930488586426,0.07205748558044434,0.04858040809631348,0.0750119686126709,0.0660245418548584,0.06986403465270996,0.06665277481079102,0.07242655754089355,0.07212424278259277,0.07210683822631836,0.06982254981994629,0.06381106376647949,0.12300801277160645,0.12935614585876465,1.2360124588012695,0.4055476188659668,0.0703887939453125,0.07035303115844727,0.07184672355651855,0.06290054321289062,0.07189536094665527 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 9f632dd5bc..f9564a83e2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,True,4,9,32,2,True,4,Tests_passed,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,True,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,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,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,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,f29f6b7336ea353a7373f9af43ca477f93c976e73f7df6a4dfaa564f6a992028,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,0.04142045974731445,0.04161572456359863,0.0398862361907959,0.024077892303466797,0.05437111854553223,0.04684734344482422,0.05645585060119629,0.1683802604675293,0.10407209396362305,1.1373326778411865,0.34421515464782715,0.041193485260009766,0.06756258010864258,0.04147982597351074,0.06844449043273926,0.06516337394714355 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,True,4,9,32,2,True,4,Tests_passed,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,True,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,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,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,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,f29f6b7336ea353a7373f9af43ca477f93c976e73f7df6a4dfaa564f6a992028,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,0.04142045974731445,0.04161572456359863,0.0398862361907959,0.024077892303466797,0.05437111854553223,0.04684734344482422,0.05645585060119629,0.1683802604675293,0.10407209396362305,1.1373326778411865,0.34421515464782715,0.041193485260009766,0.06756258010864258,0.04147982597351074,0.06844449043273926,0.06516337394714355,0.06391429901123047,0.06292486190795898,0.06915640830993652,0.06520748138427734,0.06748008728027344,0.06494283676147461,0.06724691390991211,0.10096383094787598,0.09727358818054199,1.112027645111084,0.38196897506713867,0.06310439109802246,0.06608819961547852,0.06554985046386719,0.06152033805847168,0.06764888763427734 diff --git a/results/combined/merges_timed/jboss-modules/jboss-modules.csv b/results/combined/merges_timed/jboss-modules/jboss-modules.csv index dd86f5dbe8..6013b98492 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,Tests_passed,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,True,21,87,634,2,True,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,True,21,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_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,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_failed,3c796f52493eb95c28e5bb70994f83ced4ab935302b7301bcf1c4b9b56202de9,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,0.04726243019104004,0.04599499702453613,0.05318498611450195,0.022204875946044922,0.05169391632080078,0.05576968193054199,0.04208040237426758,0.1630992889404297,0.11684799194335938,0.7817223072052002,0.6591777801513672,0.038025856018066406,0.06431365013122559,0.03793787956237793,0.0640707015991211,0.06557965278625488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,Tests_passed,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,True,21,87,634,2,True,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,True,21,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_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,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_failed,3c796f52493eb95c28e5bb70994f83ced4ab935302b7301bcf1c4b9b56202de9,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,0.04726243019104004,0.04599499702453613,0.05318498611450195,0.022204875946044922,0.05169391632080078,0.05576968193054199,0.04208040237426758,0.1630992889404297,0.11684799194335938,0.7817223072052002,0.6591777801513672,0.038025856018066406,0.06431365013122559,0.03793787956237793,0.0640707015991211,0.06557965278625488,0.061931610107421875,0.06215643882751465,0.06134676933288574,0.06214118003845215,0.06565690040588379,0.06447505950927734,0.06184697151184082,0.09772491455078125,0.09358668327331543,0.8042974472045898,0.7036218643188477,0.0610654354095459,0.062009572982788086,0.06392502784729004,0.06144905090332031,0.06194901466369629 diff --git a/results/combined/merges_timed/jboss-msc/jboss-msc.csv b/results/combined/merges_timed/jboss-msc/jboss-msc.csv index b891a33e14..e7e00042d2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,True,False,True,3,93,280,3,True,3,Tests_passed,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,True,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,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,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Tests_failed,4f7c57167caab4a1fbad985f6e7204e9d9528226f592cfe126022dc79854bd37,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,686120a8db22b945cb42adfd009bec0d68685f3788931a00aaf712f638aecfad,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,8d097ccd86f70cc5f02817652d60bf28700d595d4f8936157bc45e8d1ca2110d,Tests_failed,f7c29c571eb687a46c9cf37531323fc62d45fd57f956c0491149a79edce27b9e,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,0.020793437957763672,0.021051883697509766,0.022742509841918945,0.031555891036987305,0.023035287857055664,0.02282261848449707,0.02260279655456543,0.06737852096557617,0.13423871994018555,4.043978691101074,0.7834274768829346,0.08001184463500977,0.09072256088256836,0.06671571731567383,0.08808779716491699,0.091522216796875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,True,False,True,3,93,280,3,True,3,Tests_passed,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,True,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,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,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Tests_failed,4f7c57167caab4a1fbad985f6e7204e9d9528226f592cfe126022dc79854bd37,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,686120a8db22b945cb42adfd009bec0d68685f3788931a00aaf712f638aecfad,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,8d097ccd86f70cc5f02817652d60bf28700d595d4f8936157bc45e8d1ca2110d,Tests_failed,f7c29c571eb687a46c9cf37531323fc62d45fd57f956c0491149a79edce27b9e,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,0.020793437957763672,0.021051883697509766,0.022742509841918945,0.031555891036987305,0.023035287857055664,0.02282261848449707,0.02260279655456543,0.06737852096557617,0.13423871994018555,4.043978691101074,0.7834274768829346,0.08001184463500977,0.09072256088256836,0.06671571731567383,0.08808779716491699,0.091522216796875,0.08290958404541016,0.0836944580078125,0.08512091636657715,0.08680891990661621,0.08604693412780762,0.07777786254882812,0.07120251655578613,0.11717009544372559,0.17355799674987793,4.371775150299072,0.8842122554779053,0.08361697196960449,0.0858006477355957,0.08382058143615723,0.08417224884033203,0.08495116233825684 diff --git a/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv b/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv index 2c8e9b6390..b2f5604059 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -204,refs/remotes/origin/5.0,050c1fa2551eea88f7caf1f051ffea5b6fdfebf2,db1be1ce0c8c47cfc1fb32e1f9cefd47b4c96661,7ac33ddc3585b9685a6d7866c6b596389bb55110,,True,True,True,12,38,498,2,True,12,Tests_passed,37b6db33953d2a0ddde294da73adfa49e2d6335f8a14e3b06404fef1ec24b54d,True,Tests_passed,52a2db13cbf3c6cdb6916d09a47ffbb7907f2507da601405d68b4aa8306fe5ac,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,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_failed,31d8adff573a5c9cd295aa6bb05d02f343ea7a7ea0aeea163c1854faab54c36e,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,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,cd9986586f1925a3e934cfa8551c72418351d23189747f93c63db7b0a74ac7a3,Tests_failed,31d8adff573a5c9cd295aa6bb05d02f343ea7a7ea0aeea163c1854faab54c36e,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,0.014517545700073242,0.015254974365234375,0.018163681030273438,0.025421142578125,0.01770186424255371,0.017651081085205078,0.01753997802734375,0.04570174217224121,0.0704038143157959,1.0225939750671387,0.552126407623291,0.04776263236999512,0.07262516021728516,0.04835987091064453,0.07400035858154297,0.0742650032043457 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +204,refs/remotes/origin/5.0,050c1fa2551eea88f7caf1f051ffea5b6fdfebf2,db1be1ce0c8c47cfc1fb32e1f9cefd47b4c96661,7ac33ddc3585b9685a6d7866c6b596389bb55110,,True,True,True,12,38,498,2,True,12,Tests_passed,37b6db33953d2a0ddde294da73adfa49e2d6335f8a14e3b06404fef1ec24b54d,True,Tests_passed,52a2db13cbf3c6cdb6916d09a47ffbb7907f2507da601405d68b4aa8306fe5ac,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,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_failed,31d8adff573a5c9cd295aa6bb05d02f343ea7a7ea0aeea163c1854faab54c36e,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,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,cd9986586f1925a3e934cfa8551c72418351d23189747f93c63db7b0a74ac7a3,Tests_failed,31d8adff573a5c9cd295aa6bb05d02f343ea7a7ea0aeea163c1854faab54c36e,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,0.014517545700073242,0.015254974365234375,0.018163681030273438,0.025421142578125,0.01770186424255371,0.017651081085205078,0.01753997802734375,0.04570174217224121,0.0704038143157959,1.0225939750671387,0.552126407623291,0.04776263236999512,0.07262516021728516,0.04835987091064453,0.07400035858154297,0.0742650032043457,0.06964373588562012,0.07213783264160156,0.07328963279724121,0.07608604431152344,0.07278823852539062,0.07484626770019531,0.07259225845336914,0.11285090446472168,0.10372376441955566,1.1555180549621582,0.6082215309143066,0.0716543197631836,0.07183265686035156,0.0696108341217041,0.07178688049316406,0.06887459754943848 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 41d95141fb..9b4c95c479 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,True,False,Tests_passed,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,True,4,9,32,2,True,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,True,4,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,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,14b584c42864b1406665e29ea709646c04661d20292267ab8554729a8ef4e92f,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,0.041670799255371094,0.04214191436767578,0.04556107521057129,0.016097545623779297,0.03881359100341797,0.04252314567565918,0.04600977897644043,0.1659862995147705,0.09315776824951172,0.8557000160217285,0.3335587978363037,0.0321500301361084,0.058765411376953125,0.03104877471923828,0.05984950065612793,0.06025409698486328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,True,False,Tests_passed,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,True,4,9,32,2,True,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,True,4,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,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,14b584c42864b1406665e29ea709646c04661d20292267ab8554729a8ef4e92f,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,1e4899d8d077cc54953d19b01b2fbd710ea363e5b9060c9c90f26bb641f44324,Tests_passed,fe8f17a9c8ac7b509d4db864b7c0e4c781ebd80fd44cd28a650f8d0c268a3915,0.041670799255371094,0.04214191436767578,0.04556107521057129,0.016097545623779297,0.03881359100341797,0.04252314567565918,0.04600977897644043,0.1659862995147705,0.09315776824951172,0.8557000160217285,0.3335587978363037,0.0321500301361084,0.058765411376953125,0.03104877471923828,0.05984950065612793,0.06025409698486328,0.057353973388671875,0.05785775184631348,0.05823659896850586,0.05804085731506348,0.05690932273864746,0.05947136878967285,0.05844473838806152,0.09002876281738281,0.09098029136657715,0.8453652858734131,0.36336755752563477,0.05700564384460449,0.05703997611999512,0.05804276466369629,0.05672025680541992,0.05979514122009277 diff --git a/results/combined/merges_timed/jbossas/jboss-dmr.csv b/results/combined/merges_timed/jbossas/jboss-dmr.csv index c496283ed1..96accc9ebb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,True,2,3,36,2,True,2,Tests_passed,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,True,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,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_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,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,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,0.0456387996673584,0.029156208038330078,0.04403281211853027,0.016776561737060547,0.0423736572265625,0.025338411331176758,0.0523381233215332,0.15220236778259277,0.09449577331542969,0.02856302261352539,0.4324002265930176,0.03340315818786621,0.06625771522521973,0.0330967903137207,0.06497406959533691,0.06539273262023926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,True,2,3,36,2,True,2,Tests_passed,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,True,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,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_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,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,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,0.0456387996673584,0.029156208038330078,0.04403281211853027,0.016776561737060547,0.0423736572265625,0.025338411331176758,0.0523381233215332,0.15220236778259277,0.09449577331542969,0.02856302261352539,0.4324002265930176,0.03340315818786621,0.06625771522521973,0.0330967903137207,0.06497406959533691,0.06539273262023926,0.0651865005493164,0.06662178039550781,0.10953688621520996,0.06641674041748047,0.06316852569580078,0.06438350677490234,0.062398672103881836,0.10065984725952148,0.09547305107116699,0.07503581047058105,0.4854574203491211,0.0658104419708252,0.0638892650604248,0.06610774993896484,0.067169189453125,0.06340646743774414 diff --git a/results/combined/merges_timed/jbossas/remoting-jmx.csv b/results/combined/merges_timed/jbossas/remoting-jmx.csv index 239b12a2ad..9a1edf82d2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,True,72,314,3039,3,True,72,Tests_passed,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,True,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,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,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,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,529b3fe3e58f688997f56ede7e537154a4ef8f3481d3bc796fae2b51827eb01b,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,0.019644498825073242,0.019719839096069336,0.021045446395874023,0.030426979064941406,0.02124190330505371,0.021291017532348633,0.020477771759033203,0.06156635284423828,0.12647604942321777,0.899738073348999,1.0550475120544434,0.050527095794677734,0.09643101692199707,0.049561500549316406,0.09530138969421387,0.09670782089233398 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,True,72,314,3039,3,True,72,Tests_passed,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,True,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,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,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,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,529b3fe3e58f688997f56ede7e537154a4ef8f3481d3bc796fae2b51827eb01b,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,0.019644498825073242,0.019719839096069336,0.021045446395874023,0.030426979064941406,0.02124190330505371,0.021291017532348633,0.020477771759033203,0.06156635284423828,0.12647604942321777,0.899738073348999,1.0550475120544434,0.050527095794677734,0.09643101692199707,0.049561500549316406,0.09530138969421387,0.09670782089233398,0.08971428871154785,0.09011530876159668,0.09393477439880371,0.09335494041442871,0.09203410148620605,0.09118318557739258,0.09296512603759766,0.14210057258605957,0.14665722846984863,1.0341808795928955,1.0866122245788574,0.09017562866210938,0.09145951271057129,0.09137964248657227,0.09028792381286621,0.08983016014099121 diff --git a/results/combined/merges_timed/jbossas/staxmapper.csv b/results/combined/merges_timed/jbossas/staxmapper.csv index 5e5e90ae18..e74e1572b0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,True,True,True,9,68,225,2,True,9,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,True,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,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,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,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,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,0f1552eac3108a0f140cbdf9c407385b77dc98322c65fcd6c7c5f4f84a398bf9,Tests_failed,472365f9791be797e6836c7e14520ffda7266c4a17dd5cc869fd6286e4a0b066,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,0.043792009353637695,0.043349266052246094,0.011822700500488281,0.014447927474975586,0.04403257369995117,0.04424643516540527,0.04686713218688965,0.16006827354431152,0.1146235466003418,1.0340924263000488,0.3548696041107178,0.030073165893554688,0.058682918548583984,0.03060293197631836,0.05605959892272949,0.05513572692871094 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,True,True,True,9,68,225,2,True,9,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,True,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,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,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,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,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,0f1552eac3108a0f140cbdf9c407385b77dc98322c65fcd6c7c5f4f84a398bf9,Tests_failed,472365f9791be797e6836c7e14520ffda7266c4a17dd5cc869fd6286e4a0b066,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,0.043792009353637695,0.043349266052246094,0.011822700500488281,0.014447927474975586,0.04403257369995117,0.04424643516540527,0.04686713218688965,0.16006827354431152,0.1146235466003418,1.0340924263000488,0.3548696041107178,0.030073165893554688,0.058682918548583984,0.03060293197631836,0.05605959892272949,0.05513572692871094,0.05272865295410156,0.05243992805480957,0.05320858955383301,0.053682565689086914,0.05461835861206055,0.05495023727416992,0.054558515548706055,0.08524775505065918,0.08475279808044434,1.0485613346099854,0.39022159576416016,0.05501055717468262,0.05523204803466797,0.05319380760192871,0.053151845932006836,0.052504539489746094 diff --git a/results/combined/merges_timed/jcabi/jcabi-aspects.csv b/results/combined/merges_timed/jcabi/jcabi-aspects.csv index fb7c6d5232..19e53cb61c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,True,25,91,805,2,True,25,Tests_passed,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,True,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,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,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,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_failed,a9d0541d8f2b68e23689a56c812e33db65a1ad4c6d7ae0ec091e6185f1dd97af,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,0.06029176712036133,0.04261970520019531,0.04115581512451172,0.034630537033081055,0.06234288215637207,0.04661226272583008,0.05308413505554199,0.18850088119506836,0.11144304275512695,0.04622626304626465,0.6298410892486572,0.06501436233520508,0.08896541595458984,0.06155991554260254,0.08818411827087402,0.08553004264831543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,True,25,91,805,2,True,25,Tests_passed,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,True,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,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,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,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_failed,a9d0541d8f2b68e23689a56c812e33db65a1ad4c6d7ae0ec091e6185f1dd97af,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,0.06029176712036133,0.04261970520019531,0.04115581512451172,0.034630537033081055,0.06234288215637207,0.04661226272583008,0.05308413505554199,0.18850088119506836,0.11144304275512695,0.04622626304626465,0.6298410892486572,0.06501436233520508,0.08896541595458984,0.06155991554260254,0.08818411827087402,0.08553004264831543,0.08811235427856445,0.07824325561523438,0.09106874465942383,0.09114694595336914,0.08962297439575195,0.0925760269165039,0.08837461471557617,0.13065624237060547,0.11648678779602051,0.1025705337524414,0.6580860614776611,0.08269524574279785,0.08524608612060547,0.08604621887207031,0.08678865432739258,0.07203197479248047 diff --git a/results/combined/merges_timed/jcabi/jcabi-dynamo.csv b/results/combined/merges_timed/jcabi/jcabi-dynamo.csv index d4522ca431..b3a8db869b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,True,5,18,103,2,True,5,Tests_passed,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,True,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,True,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,ec408189b017722049068fe65dc20a5a9fa3bc67b14ee152f589be72f771d007,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,577c161640544eb113d27cbefb8db4c1da3e4da3030bf8bcfbd524e69c1f2028,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Tests_failed,fd7f4c1c39c5748f7cf0de44b4cffbe7d4f6faec21dd362ba53bcd275a489ebd,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,0.01440882682800293,0.014430999755859375,0.014841556549072266,0.022603511810302734,0.014645814895629883,0.014591217041015625,0.014533519744873047,0.045729875564575195,0.07330751419067383,0.017394542694091797,0.33176660537719727,0.051846981048583984,0.05155062675476074,0.052104949951171875,0.054030656814575195,0.053885698318481445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,True,5,18,103,2,True,5,Tests_passed,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,True,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,True,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,ec408189b017722049068fe65dc20a5a9fa3bc67b14ee152f589be72f771d007,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,577c161640544eb113d27cbefb8db4c1da3e4da3030bf8bcfbd524e69c1f2028,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Tests_failed,fd7f4c1c39c5748f7cf0de44b4cffbe7d4f6faec21dd362ba53bcd275a489ebd,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,0.01440882682800293,0.014430999755859375,0.014841556549072266,0.022603511810302734,0.014645814895629883,0.014591217041015625,0.014533519744873047,0.045729875564575195,0.07330751419067383,0.017394542694091797,0.33176660537719727,0.051846981048583984,0.05155062675476074,0.052104949951171875,0.054030656814575195,0.053885698318481445,0.05126452445983887,0.05016207695007324,0.05214691162109375,0.0512847900390625,0.05299115180969238,0.053311824798583984,0.05116701126098633,0.08624768257141113,0.09249234199523926,0.06684064865112305,0.3790550231933594,0.05388689041137695,0.051416635513305664,0.05256295204162598,0.05198240280151367,0.05214047431945801 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 53fb41c446..8100496ea5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,True,11,15,304,2,True,11,Tests_passed,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,True,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,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,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,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,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,0.011803388595581055,0.011474370956420898,0.012703657150268555,0.019329309463500977,0.01265716552734375,0.01243281364440918,0.01274561882019043,0.03861808776855469,0.06675982475280762,0.01475977897644043,-1.0,0.038785696029663086,0.06299638748168945,0.03811144828796387,0.0636603832244873,0.06294512748718262 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,True,11,15,304,2,True,11,Tests_passed,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,True,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,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,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,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,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,0.011803388595581055,0.011474370956420898,0.012703657150268555,0.019329309463500977,0.01265716552734375,0.01243281364440918,0.01274561882019043,0.03861808776855469,0.06675982475280762,0.01475977897644043,-1.0,0.038785696029663086,0.06299638748168945,0.03811144828796387,0.0636603832244873,0.06294512748718262,0.06085658073425293,0.0613858699798584,0.06225013732910156,0.06324577331542969,0.06250619888305664,0.06232762336730957,0.06244635581970215,0.09569358825683594,0.0957939624786377,0.07426691055297852,-1.0,0.05984926223754883,0.06189298629760742,0.06039619445800781,0.060205698013305664,0.06068015098571777 diff --git a/results/combined/merges_timed/jcabi/jcabi-github.csv b/results/combined/merges_timed/jcabi/jcabi-github.csv index b9cd1f7184..66356dd09e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -834,refs/heads/master,3f10b3378f1939d1144bef90dfbad5e3c43071b5,880a05dd9f52b987255c6e012146fb31d69d3546,28426aeae14b3edc4fadf021501f8b4d6f98f66a,,True,True,True,60,88,8537.0,2,True,60,Tests_passed,2775dc74f5680ba237ac25aed61d18db659d7a6a7ffb284f44d37d4b189826b8,True,Tests_passed,7622bc13f9038a64ef459d326c811bf274dd0dea36af697dbb0d383eeed69e68,True,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,690ba674009119f1d6eeb976e2e00df804ead44e1ab587e6cf984fd10c9a5752,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Tests_failed,adc5c7e057f67f1f5a432a52376b9bf7e9ce49579667830fb1e2d0df2bed26fa,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,311620332b7b5f8dda1ac055e5cd86cf4808468f4c08dcb16b8422f5be2327ff,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,f4bba2b41a451a53c033c8a46e3568c396cf9d8b2a64a601d72e9ca2a1cc3b8d,Tests_failed,7ae72f7321fe1965b2098e65cc99ece83ca8f3ea8183b39bf8fcc9e037f13251,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,0.0524444580078125,0.05043792724609375,0.05579018592834473,0.02376079559326172,0.05350208282470703,0.05733084678649902,0.0527186393737793,0.19909405708312988,0.11261892318725586,0.5503950119018555,0.5343282222747803,0.055019378662109375,0.05043625831604004,0.050005435943603516,0.0558934211730957,0.0580899715423584 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +834,refs/heads/master,3f10b3378f1939d1144bef90dfbad5e3c43071b5,880a05dd9f52b987255c6e012146fb31d69d3546,28426aeae14b3edc4fadf021501f8b4d6f98f66a,,True,True,True,60,88,8537.0,2,True,60,Tests_passed,2775dc74f5680ba237ac25aed61d18db659d7a6a7ffb284f44d37d4b189826b8,True,Tests_passed,7622bc13f9038a64ef459d326c811bf274dd0dea36af697dbb0d383eeed69e68,True,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,690ba674009119f1d6eeb976e2e00df804ead44e1ab587e6cf984fd10c9a5752,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Tests_failed,adc5c7e057f67f1f5a432a52376b9bf7e9ce49579667830fb1e2d0df2bed26fa,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,311620332b7b5f8dda1ac055e5cd86cf4808468f4c08dcb16b8422f5be2327ff,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,f4bba2b41a451a53c033c8a46e3568c396cf9d8b2a64a601d72e9ca2a1cc3b8d,Tests_failed,7ae72f7321fe1965b2098e65cc99ece83ca8f3ea8183b39bf8fcc9e037f13251,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,0.0524444580078125,0.05043792724609375,0.05579018592834473,0.02376079559326172,0.05350208282470703,0.05733084678649902,0.0527186393737793,0.19909405708312988,0.11261892318725586,0.5503950119018555,0.5343282222747803,0.055019378662109375,0.05043625831604004,0.050005435943603516,0.0558934211730957,0.0580899715423584,0.058329105377197266,0.056728363037109375,0.05324363708496094,0.05835437774658203,0.05836009979248047,0.05521512031555176,0.056259870529174805,0.0919487476348877,0.08887648582458496,0.6103944778442383,0.634443998336792,0.05637192726135254,0.05289459228515625,0.05494379997253418,0.05666637420654297,0.05690598487854004 diff --git a/results/combined/merges_timed/jcabi/jcabi-http.csv b/results/combined/merges_timed/jcabi/jcabi-http.csv index 433a0b551d..e5cffb8a79 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,True,5,19,147,2,True,5,Tests_passed,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,True,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,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,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,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,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,0.035778045654296875,0.016675233840942383,0.027785778045654297,0.03263688087463379,0.05981755256652832,0.032016754150390625,0.047028541564941406,0.19626998901367188,0.10677933692932129,0.04112839698791504,0.26447010040283203,0.06002545356750488,0.0855100154876709,0.0604557991027832,0.08557724952697754,0.08567023277282715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,True,5,19,147,2,True,5,Tests_passed,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,True,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,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,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,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,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,0.035778045654296875,0.016675233840942383,0.027785778045654297,0.03263688087463379,0.05981755256652832,0.032016754150390625,0.047028541564941406,0.19626998901367188,0.10677933692932129,0.04112839698791504,0.26447010040283203,0.06002545356750488,0.0855100154876709,0.0604557991027832,0.08557724952697754,0.08567023277282715,0.08392500877380371,0.08795642852783203,0.06906867027282715,0.0939934253692627,0.08919501304626465,0.08723878860473633,0.08821368217468262,0.11905813217163086,0.13098907470703125,0.10640358924865723,0.33247947692871094,0.08852410316467285,0.08913278579711914,0.05567502975463867,0.08727002143859863,0.08680367469787598 diff --git a/results/combined/merges_timed/jcabi/jcabi-jdbc.csv b/results/combined/merges_timed/jcabi/jcabi-jdbc.csv index 497b76ff59..4a69a04e33 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,False,True,4,4,8,4,True,4,Tests_passed,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,True,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,True,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,1da3a869425ebb4e7539347002f7912b4d963378289e6564e8841ebe191c6ba1,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,3dd3cbd81b3587a96fdd292998eee8dd0360e8fa31ceb6edb3fc3b29863262c8,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,030a03b3e898844973ce2c9982aa09d523a1f9228185c0d431d4d633877f38e7,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,0.041512489318847656,0.0423121452331543,0.045001983642578125,0.015164613723754883,0.04012417793273926,0.03906106948852539,0.034204721450805664,0.29531407356262207,0.23877382278442383,1.9275801181793213,0.28118181228637695,0.06394386291503906,0.06516695022583008,0.06256818771362305,0.06568646430969238,0.06571149826049805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,False,True,4,4,8,4,True,4,Tests_passed,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,True,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,True,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,1da3a869425ebb4e7539347002f7912b4d963378289e6564e8841ebe191c6ba1,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,3dd3cbd81b3587a96fdd292998eee8dd0360e8fa31ceb6edb3fc3b29863262c8,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,030a03b3e898844973ce2c9982aa09d523a1f9228185c0d431d4d633877f38e7,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,0.041512489318847656,0.0423121452331543,0.045001983642578125,0.015164613723754883,0.04012417793273926,0.03906106948852539,0.034204721450805664,0.29531407356262207,0.23877382278442383,1.9275801181793213,0.28118181228637695,0.06394386291503906,0.06516695022583008,0.06256818771362305,0.06568646430969238,0.06571149826049805,0.06344413757324219,0.061937808990478516,0.06267333030700684,0.062192678451538086,0.06284165382385254,0.06220078468322754,0.06218862533569336,0.12400317192077637,0.15276002883911133,2.0280661582946777,0.3460822105407715,0.06366133689880371,0.06381869316101074,0.06253337860107422,0.0630640983581543,0.0631864070892334 diff --git a/results/combined/merges_timed/jcabi/jcabi-manifests.csv b/results/combined/merges_timed/jcabi/jcabi-manifests.csv index 24b23750f5..51bef0eced 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,True,23,92,816,3,True,23,Tests_passed,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,True,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,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,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Tests_failed,b7b8aefef5551d20ccc3b2fd26f1853e7900635bc0cd4cd2f90ad2d12333321d,Tests_passed,ab771d2c42a4cdf7b12ef8c35f9a3147d2e281644486eaaa0517c970b02f308b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,e1ad15a00ccdf53271d9dfc46a38f47659abb843080a3e9c64406f189a26239f,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Tests_failed,74385a1eee5354c45e9dab8826c7ea38ab9a8c1f4b2846a3e566e290cec8699b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,0.0432126522064209,0.05137968063354492,0.05076861381530762,0.017975807189941406,0.04836535453796387,0.05072188377380371,0.05404520034790039,0.24791812896728516,0.17858219146728516,0.03897666931152344,0.3206186294555664,0.053743839263916016,0.0679011344909668,0.04910612106323242,0.07425045967102051,0.0690913200378418 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,True,23,92,816,3,True,23,Tests_passed,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,True,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,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,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Tests_failed,b7b8aefef5551d20ccc3b2fd26f1853e7900635bc0cd4cd2f90ad2d12333321d,Tests_passed,ab771d2c42a4cdf7b12ef8c35f9a3147d2e281644486eaaa0517c970b02f308b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,e1ad15a00ccdf53271d9dfc46a38f47659abb843080a3e9c64406f189a26239f,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Tests_failed,74385a1eee5354c45e9dab8826c7ea38ab9a8c1f4b2846a3e566e290cec8699b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,0.0432126522064209,0.05137968063354492,0.05076861381530762,0.017975807189941406,0.04836535453796387,0.05072188377380371,0.05404520034790039,0.24791812896728516,0.17858219146728516,0.03897666931152344,0.3206186294555664,0.053743839263916016,0.0679011344909668,0.04910612106323242,0.07425045967102051,0.0690913200378418,0.0726015567779541,0.06771636009216309,0.07309627532958984,0.06573629379272461,0.06720590591430664,0.06549644470214844,0.0654458999633789,0.1141667366027832,0.12639975547790527,0.08649802207946777,0.3866891860961914,0.07056927680969238,0.07130765914916992,0.07119941711425781,0.07238197326660156,0.06739926338195801 diff --git a/results/combined/merges_timed/jcabi/jcabi-w3c.csv b/results/combined/merges_timed/jcabi/jcabi-w3c.csv index 011421455c..c1ab14992e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,True,True,True,8,27,222,2,True,8,Tests_passed,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,True,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,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,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,309542dd82960115d1d348531f7084f061d1570221a4ffbdc7b27ca94f1b15c0,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Tests_failed,52956fde38cfffd8fc193a5cb3b5bac333df3e27f0fa734edac442db239d5766,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,0.05121588706970215,0.05019712448120117,0.044692277908325195,0.015443563461303711,0.0411219596862793,0.04586982727050781,0.04234743118286133,0.16963696479797363,0.11520838737487793,0.03979325294494629,0.2662227153778076,0.04515242576599121,0.042249441146850586,0.04437112808227539,0.045105695724487305,0.04437541961669922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,True,True,True,8,27,222,2,True,8,Tests_passed,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,True,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,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,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,309542dd82960115d1d348531f7084f061d1570221a4ffbdc7b27ca94f1b15c0,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Tests_failed,52956fde38cfffd8fc193a5cb3b5bac333df3e27f0fa734edac442db239d5766,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,0.05121588706970215,0.05019712448120117,0.044692277908325195,0.015443563461303711,0.0411219596862793,0.04586982727050781,0.04234743118286133,0.16963696479797363,0.11520838737487793,0.03979325294494629,0.2662227153778076,0.04515242576599121,0.042249441146850586,0.04437112808227539,0.045105695724487305,0.04437541961669922,0.04511404037475586,0.04382896423339844,0.04559898376464844,0.046053409576416016,0.044194936752319336,0.043244123458862305,0.0445561408996582,0.07902288436889648,0.07829856872558594,0.06010079383850098,0.3334321975708008,0.04529142379760742,0.04395866394042969,0.045572757720947266,0.0450437068939209,0.04522299766540527 diff --git a/results/combined/merges_timed/jclawson/hazeltask.csv b/results/combined/merges_timed/jclawson/hazeltask.csv index 5ca5f0590a..b3dfd045c8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,True,True,Tests_passed,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,True,17,56,1153,2,True,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,True,17,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,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,871ec61289f7563ff697b8d795e1197874c23beb5e061db5a9c6dfdff0b72fe2,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Tests_failed,ebe194e9366951b0f2eef445b217c3a70e2f1b757c694116c8b47638b485e43f,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,0.010082244873046875,0.010142803192138672,0.010045289993286133,0.01631951332092285,0.010230541229248047,0.010212182998657227,0.010469675064086914,0.03547096252441406,0.06695151329040527,0.9874234199523926,0.398820161819458,0.04962015151977539,0.04561924934387207,0.051162004470825195,0.0625619888305664,0.04544544219970703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,True,True,Tests_passed,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,True,17,56,1153,2,True,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,True,17,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,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,871ec61289f7563ff697b8d795e1197874c23beb5e061db5a9c6dfdff0b72fe2,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Tests_failed,ebe194e9366951b0f2eef445b217c3a70e2f1b757c694116c8b47638b485e43f,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,0.010082244873046875,0.010142803192138672,0.010045289993286133,0.01631951332092285,0.010230541229248047,0.010212182998657227,0.010469675064086914,0.03547096252441406,0.06695151329040527,0.9874234199523926,0.398820161819458,0.04962015151977539,0.04561924934387207,0.051162004470825195,0.0625619888305664,0.04544544219970703,0.05931401252746582,0.04218626022338867,0.058466434478759766,0.044765472412109375,0.05829906463623047,0.05803084373474121,0.06036019325256348,0.09022378921508789,0.09267139434814453,1.070948839187622,0.46317052841186523,0.05782151222229004,0.061559438705444336,0.06118321418762207,0.059624433517456055,0.04420971870422363 diff --git a/results/combined/merges_timed/jdatepicker/jdatepicker.csv b/results/combined/merges_timed/jdatepicker/jdatepicker.csv index b8987c1176..2d88ea0072 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,False,True,5,17,84,3,True,5,Tests_passed,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,True,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,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,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,35293302a22261a5d266f65acddb3f7997de055152b742c4bd6c4dab683b34eb,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,0.04346179962158203,0.03763771057128906,0.042702674865722656,0.019163131713867188,0.043234825134277344,0.055725812911987305,0.045609235763549805,0.24699902534484863,0.1636662483215332,2.1409525871276855,0.39520812034606934,0.03610658645629883,0.08371901512145996,0.036104440689086914,0.08598947525024414,0.08331608772277832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,False,True,5,17,84,3,True,5,Tests_passed,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,True,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,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,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,35293302a22261a5d266f65acddb3f7997de055152b742c4bd6c4dab683b34eb,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,Tests_passed,ceefd5771da7e7d54b6c36ecf0cc803663c23cc2eb1179d589612e35bbf34662,0.04346179962158203,0.03763771057128906,0.042702674865722656,0.019163131713867188,0.043234825134277344,0.055725812911987305,0.045609235763549805,0.24699902534484863,0.1636662483215332,2.1409525871276855,0.39520812034606934,0.03610658645629883,0.08371901512145996,0.036104440689086914,0.08598947525024414,0.08331608772277832,0.08768939971923828,0.0852975845336914,0.08533191680908203,0.08761382102966309,0.08809781074523926,0.08571147918701172,0.08685970306396484,0.1392989158630371,0.141524076461792,2.540494918823242,0.44893431663513184,0.08623218536376953,0.08373498916625977,0.08643102645874023,0.08440732955932617,0.08467316627502441 diff --git a/results/combined/merges_timed/jdeparser/jdeparser2.csv b/results/combined/merges_timed/jdeparser/jdeparser2.csv index 8a5de2d4c0..6834ef3f56 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,True,True,True,39,80,731,2,True,39,Tests_passed,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,True,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,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_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,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_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,eed14f87d70d070d200b395e37980bb33fdfcd4d1ebbf9bb6841e64c6e78f7bf,Tests_failed,55b4ef33d7819b70ed67d6bb1639008df70bd09b93a44bcb13aba8dcde38ff03,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,0.04601931571960449,0.03136038780212402,0.043140411376953125,0.02455759048461914,0.05830645561218262,0.050133466720581055,0.04506707191467285,0.16785812377929688,0.10609745979309082,1.3957955837249756,0.6534874439239502,0.036922454833984375,0.06890702247619629,0.04529404640197754,0.06860780715942383,0.06333136558532715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,True,True,True,39,80,731,2,True,39,Tests_passed,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,True,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,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_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,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_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,eed14f87d70d070d200b395e37980bb33fdfcd4d1ebbf9bb6841e64c6e78f7bf,Tests_failed,55b4ef33d7819b70ed67d6bb1639008df70bd09b93a44bcb13aba8dcde38ff03,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,0.04601931571960449,0.03136038780212402,0.043140411376953125,0.02455759048461914,0.05830645561218262,0.050133466720581055,0.04506707191467285,0.16785812377929688,0.10609745979309082,1.3957955837249756,0.6534874439239502,0.036922454833984375,0.06890702247619629,0.04529404640197754,0.06860780715942383,0.06333136558532715,0.07061171531677246,0.06640386581420898,0.0707700252532959,0.07329297065734863,0.07106781005859375,0.07117104530334473,0.0750722885131836,0.10988163948059082,0.10086178779602051,1.5678906440734863,0.7493977546691895,0.06356382369995117,0.07100820541381836,0.07196402549743652,0.06796622276306152,0.06331706047058105 diff --git a/results/combined/merges_timed/jdkcn/jabberer.csv b/results/combined/merges_timed/jdkcn/jabberer.csv index 53f641e974..47ef5ee9b9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,True,True,Tests_passed,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,True,28,1523,28602,7,True,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,True,32,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,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,0661425d7ae5fbf117b69d0bd824c818922161d74637547e7c2e9945803c79b4,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,de4a02b14db6719daf3486d50111e3e24847c551994e64bfc6d79e8b72d72765,Tests_failed,0800c45f380fc1e478be95615a2537421b6580476c834914c9dcfa0cba633ab4,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,0.04365372657775879,0.053040504455566406,0.06354641914367676,0.02846217155456543,0.04703783988952637,0.04058098793029785,0.03015899658203125,0.24705886840820312,0.14580154418945312,0.7819328308105469,0.37699437141418457,0.05238008499145508,0.0755007266998291,0.06366920471191406,0.10435628890991211,0.09675002098083496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,True,True,Tests_passed,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,True,28,1523,28602,7,True,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,True,32,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,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,0661425d7ae5fbf117b69d0bd824c818922161d74637547e7c2e9945803c79b4,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,de4a02b14db6719daf3486d50111e3e24847c551994e64bfc6d79e8b72d72765,Tests_failed,0800c45f380fc1e478be95615a2537421b6580476c834914c9dcfa0cba633ab4,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,7ba422e5ea81c037c5f98dfe39e8cabb105e459d3bba64f05fb62d47ef4c6383,0.04365372657775879,0.053040504455566406,0.06354641914367676,0.02846217155456543,0.04703783988952637,0.04058098793029785,0.03015899658203125,0.24705886840820312,0.14580154418945312,0.7819328308105469,0.37699437141418457,0.05238008499145508,0.0755007266998291,0.06366920471191406,0.10435628890991211,0.09675002098083496,0.09868049621582031,0.08979058265686035,0.10505819320678711,0.09633278846740723,0.11516880989074707,0.11772751808166504,0.1167917251586914,0.1631758213043213,0.16625332832336426,0.8367884159088135,0.46821069717407227,0.10038256645202637,0.10048484802246094,0.10401558876037598,0.10048222541809082,0.0912160873413086 diff --git a/results/combined/merges_timed/jdupl/lancoder.csv b/results/combined/merges_timed/jdupl/lancoder.csv index f7880fa080..676081aef0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,True,24,58,548,3,True,24,Tests_passed,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,True,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,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,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,813d44cc7418fca3a0978a34f0ebae08a6a3e4d1da8a63af6d98e9649dda4b63,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,7901462fcbd13dab60185e813c4819f517789d32c042c276104f51504d71b73f,Tests_failed,0083d19f75eebdbf175254bf8fd6ab69b08a43b7037edc176ebf1e9b64e1cdb8,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,0.02175426483154297,0.031899213790893555,0.04398226737976074,0.01662278175354004,0.04331374168395996,0.04799675941467285,0.04114055633544922,0.2342205047607422,0.16415643692016602,1.267211675643921,0.528109073638916,0.055460214614868164,0.07960104942321777,0.05413961410522461,0.07745814323425293,0.07999682426452637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,True,24,58,548,3,True,24,Tests_passed,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,True,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,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,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,813d44cc7418fca3a0978a34f0ebae08a6a3e4d1da8a63af6d98e9649dda4b63,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,7901462fcbd13dab60185e813c4819f517789d32c042c276104f51504d71b73f,Tests_failed,0083d19f75eebdbf175254bf8fd6ab69b08a43b7037edc176ebf1e9b64e1cdb8,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,0.02175426483154297,0.031899213790893555,0.04398226737976074,0.01662278175354004,0.04331374168395996,0.04799675941467285,0.04114055633544922,0.2342205047607422,0.16415643692016602,1.267211675643921,0.528109073638916,0.055460214614868164,0.07960104942321777,0.05413961410522461,0.07745814323425293,0.07999682426452637,0.07679295539855957,0.07631659507751465,0.06485509872436523,0.08176326751708984,0.08184027671813965,0.07968544960021973,0.0805666446685791,0.13407135009765625,0.1410841941833496,1.4001951217651367,0.6568930149078369,0.07583284378051758,0.07763957977294922,0.07672286033630371,0.07825732231140137,0.0776667594909668 diff --git a/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv b/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv index 89ebd65570..35b82ed7c7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,True,101,1900,7360,5,True,101,Tests_passed,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,True,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,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,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Tests_failed,467173f8a0db0890d219884a5f8554a0c6c1f97f63538761cb67eba2ab9a8530,Merge_failed,6ff50d2e70800d3f9c478846f07f905749e95aa2c00f83dea520b524834ea94e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,5f94dfcfbba4b03c8ebe646dd143920cf27af6b9ffbf7cea9853b05b81e6c26f,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,17df61fa07cad29774f4cba226dcb2d6611bab7d454a61a9349f2eddb2878a8f,Tests_failed,baf11dea81b5ef77b6c5d0560e39aeff3e2d8bdad9a75c13dfe902c16e356bef,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,0.0573430061340332,0.06896162033081055,0.05206155776977539,0.022423267364501953,0.05519223213195801,0.05531644821166992,0.04977297782897949,0.38999271392822266,0.2972872257232666,2.072251319885254,1.0458037853240967,0.06904292106628418,0.1044015884399414,0.06308984756469727,0.1017303466796875,0.12974834442138672 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,True,101,1900,7360,5,True,101,Tests_passed,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,True,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,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,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Tests_failed,467173f8a0db0890d219884a5f8554a0c6c1f97f63538761cb67eba2ab9a8530,Merge_failed,6ff50d2e70800d3f9c478846f07f905749e95aa2c00f83dea520b524834ea94e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,5f94dfcfbba4b03c8ebe646dd143920cf27af6b9ffbf7cea9853b05b81e6c26f,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,17df61fa07cad29774f4cba226dcb2d6611bab7d454a61a9349f2eddb2878a8f,Tests_failed,baf11dea81b5ef77b6c5d0560e39aeff3e2d8bdad9a75c13dfe902c16e356bef,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,0.0573430061340332,0.06896162033081055,0.05206155776977539,0.022423267364501953,0.05519223213195801,0.05531644821166992,0.04977297782897949,0.38999271392822266,0.2972872257232666,2.072251319885254,1.0458037853240967,0.06904292106628418,0.1044015884399414,0.06308984756469727,0.1017303466796875,0.12974834442138672,0.09806585311889648,0.12312197685241699,0.1009817123413086,0.1191248893737793,0.09747004508972168,0.10118460655212402,0.09894156455993652,0.18138837814331055,0.2532918453216553,2.2004244327545166,1.126849889755249,0.09853053092956543,0.09854650497436523,0.09913086891174316,0.09956955909729004,0.1233057975769043 diff --git a/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv b/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv index 68b03ef052..0f503dab8c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,False,Tests_passed,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,True,7,17,239,4,True,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,True,7,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,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,4fc8c0f97192f199cb45501d85b325a6cc6864a2fc20dcbd6dde76c72f57b509,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,1257f952f9f9dadbf53e6902844cf346485b163f99b8d2de8d81992cb1872ad2,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,0.03705930709838867,0.04033517837524414,0.0329892635345459,0.012652873992919922,0.036481618881225586,0.03766989707946777,0.037752628326416016,0.2504689693450928,0.17290091514587402,0.7454574108123779,0.2599930763244629,0.041054725646972656,0.06089067459106445,0.040437936782836914,0.060935258865356445,0.06025838851928711 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,False,Tests_passed,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,True,7,17,239,4,True,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,True,7,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,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,4fc8c0f97192f199cb45501d85b325a6cc6864a2fc20dcbd6dde76c72f57b509,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,1257f952f9f9dadbf53e6902844cf346485b163f99b8d2de8d81992cb1872ad2,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,0.03705930709838867,0.04033517837524414,0.0329892635345459,0.012652873992919922,0.036481618881225586,0.03766989707946777,0.037752628326416016,0.2504689693450928,0.17290091514587402,0.7454574108123779,0.2599930763244629,0.041054725646972656,0.06089067459106445,0.040437936782836914,0.060935258865356445,0.06025838851928711,0.058121681213378906,0.059764862060546875,0.05884742736816406,0.058321237564086914,0.0581812858581543,0.05784273147583008,0.057702064514160156,0.11336731910705566,0.11916589736938477,0.7612500190734863,0.3218727111816406,0.05888962745666504,0.05880928039550781,0.05905508995056152,0.05739951133728027,0.058687686920166016 diff --git a/results/combined/merges_timed/jeluard/semantic-versioning.csv b/results/combined/merges_timed/jeluard/semantic-versioning.csv index a491f85552..9a324435ab 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,True,23,77,819,2,True,23,Tests_passed,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,True,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,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,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,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,af7d5a55bd15f46d834a6a406c1e76ef323ed1439758ac2358a49c8272388911,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,0.009948968887329102,0.010591983795166016,0.010876893997192383,0.019015789031982422,0.010801553726196289,0.010731220245361328,0.01082921028137207,0.03607058525085449,0.06501889228820801,0.9075784683227539,0.4800846576690674,0.035180091857910156,0.06036782264709473,0.03443646430969238,0.059478759765625,0.06052279472351074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,True,23,77,819,2,True,23,Tests_passed,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,True,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,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,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,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,af7d5a55bd15f46d834a6a406c1e76ef323ed1439758ac2358a49c8272388911,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,0.009948968887329102,0.010591983795166016,0.010876893997192383,0.019015789031982422,0.010801553726196289,0.010731220245361328,0.01082921028137207,0.03607058525085449,0.06501889228820801,0.9075784683227539,0.4800846576690674,0.035180091857910156,0.06036782264709473,0.03443646430969238,0.059478759765625,0.06052279472351074,0.05599617958068848,0.058899641036987305,0.06002068519592285,0.060682058334350586,0.06075620651245117,0.057985544204711914,0.058562278747558594,0.09189438819885254,0.08822035789489746,1.0097377300262451,0.5134174823760986,0.05903935432434082,0.05771589279174805,0.05786871910095215,0.05690503120422363,0.060187578201293945 diff --git a/results/combined/merges_timed/jenkins-infra/ircbot.csv b/results/combined/merges_timed/jenkins-infra/ircbot.csv index 5ac3b26f61..0f025e3ac9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,Tests_passed,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,True,3,64,302,2,True,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,True,3,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,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,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,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,c03990b3382ffebda508a408a39798b86ea3d3d8587def73398fa622278e0ca0,Tests_failed,7c12bafaed7f44293b1018e9a619c810893b6c73f923870c0c523b3028e1cf70,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,0.009571552276611328,0.009262323379516602,0.009617805480957031,0.016413450241088867,0.01016855239868164,0.010085105895996094,0.009686470031738281,0.03406786918640137,0.06403183937072754,1.616903305053711,1.0165154933929443,0.03257179260253906,0.06116223335266113,0.03245830535888672,0.06177473068237305,0.0619816780090332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,Tests_passed,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,True,3,64,302,2,True,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,True,3,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,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,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,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,c03990b3382ffebda508a408a39798b86ea3d3d8587def73398fa622278e0ca0,Tests_failed,7c12bafaed7f44293b1018e9a619c810893b6c73f923870c0c523b3028e1cf70,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,0.009571552276611328,0.009262323379516602,0.009617805480957031,0.016413450241088867,0.01016855239868164,0.010085105895996094,0.009686470031738281,0.03406786918640137,0.06403183937072754,1.616903305053711,1.0165154933929443,0.03257179260253906,0.06116223335266113,0.03245830535888672,0.06177473068237305,0.0619816780090332,0.06185007095336914,0.061153411865234375,0.06052255630493164,0.062271833419799805,0.061408281326293945,0.06072497367858887,0.06049752235412598,0.09148764610290527,0.09677815437316895,1.7601377964019775,1.0726633071899414,0.059967041015625,0.06179332733154297,0.062181711196899414,0.05957508087158203,0.059401750564575195 diff --git a/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv b/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv index 534288e147..8ad3b07fdb 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,3f894f3216914f72244dd916e073fe7410530a0c,bdcfc6a63f73d344b500627f2db0d982aec7ba54,0530887ab2160489002c5e5866221abffbc0a0e5,,True,True,Tests_passed,2a0f9cf3207976dae038b21c883b540dc99088044a040169e8ec51c9c6b82e41,True,3,5,31,2,True,Tests_passed,4d3ecb248aab18399e1ead20dea5bafe49b2989bafd8830fe68ee1f84795078d,True,3,True,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,9baf6f338104fe273c4f003e2639a4397b05b3534e491410b245db4b548980a4,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,0.014284610748291016,0.014333486557006836,0.014715433120727539,0.017644405364990234,0.014504194259643555,0.015213489532470703,0.015857458114624023,0.04966163635253906,0.08252549171447754,1.2743773460388184,0.4124932289123535,0.03476142883300781,0.06877970695495605,0.034659624099731445,0.06463861465454102,0.06464123725891113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,3f894f3216914f72244dd916e073fe7410530a0c,bdcfc6a63f73d344b500627f2db0d982aec7ba54,0530887ab2160489002c5e5866221abffbc0a0e5,,True,True,Tests_passed,2a0f9cf3207976dae038b21c883b540dc99088044a040169e8ec51c9c6b82e41,True,3,5,31,2,True,Tests_passed,4d3ecb248aab18399e1ead20dea5bafe49b2989bafd8830fe68ee1f84795078d,True,3,True,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,9baf6f338104fe273c4f003e2639a4397b05b3534e491410b245db4b548980a4,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,Tests_passed,566cb34ae87df45742fef1606572e4c632671c70fb08b8eed3e52bbd4aa20381,0.014284610748291016,0.014333486557006836,0.014715433120727539,0.017644405364990234,0.014504194259643555,0.015213489532470703,0.015857458114624023,0.04966163635253906,0.08252549171447754,1.2743773460388184,0.4124932289123535,0.03476142883300781,0.06877970695495605,0.034659624099731445,0.06463861465454102,0.06464123725891113,0.05925488471984863,0.06520915031433105,0.06323838233947754,0.0671532154083252,0.06528306007385254,0.06550765037536621,0.06464934349060059,0.09814143180847168,0.09477782249450684,1.3883023262023926,0.44461894035339355,0.06387996673583984,0.06470942497253418,0.0652015209197998,0.06576395034790039,0.06241798400878906 diff --git a/results/combined/merges_timed/jenkinsci/ant-plugin.csv b/results/combined/merges_timed/jenkinsci/ant-plugin.csv index 952f26f623..5eec3cb7a6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,True,3,11,69.0,3,True,3,Tests_passed,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,True,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,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,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,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,2bf752d7aa5124fd3bd675f016da2bcdb67d28ba5419e90be28d518f5eec0154,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,0.009960412979125977,0.010604143142700195,0.01067352294921875,0.018774032592773438,0.010929346084594727,0.010802984237670898,0.01103520393371582,0.04788064956665039,0.11848020553588867,1.8841488361358643,0.3900763988494873,0.03457188606262207,0.08183813095092773,0.03400301933288574,0.08044886589050293,0.08242535591125488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,True,3,11,69.0,3,True,3,Tests_passed,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,True,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,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,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,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,2bf752d7aa5124fd3bd675f016da2bcdb67d28ba5419e90be28d518f5eec0154,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,0.009960412979125977,0.010604143142700195,0.01067352294921875,0.018774032592773438,0.010929346084594727,0.010802984237670898,0.01103520393371582,0.04788064956665039,0.11848020553588867,1.8841488361358643,0.3900763988494873,0.03457188606262207,0.08183813095092773,0.03400301933288574,0.08044886589050293,0.08242535591125488,0.07730937004089355,0.07857990264892578,0.07992744445800781,0.08019518852233887,0.07828354835510254,0.08089733123779297,0.07774686813354492,0.12491679191589355,0.1336803436279297,2.028958559036255,0.43958163261413574,0.07833194732666016,0.07991337776184082,0.07684445381164551,0.07947802543640137,0.07806801795959473 diff --git a/results/combined/merges_timed/jenkinsci/backend-update-center2.csv b/results/combined/merges_timed/jenkinsci/backend-update-center2.csv index f5f92185fd..a4b0a116da 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,False,Tests_passed,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,True,10,21,66,2,True,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,True,10,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,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,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,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,f4b9f2bc2eae16c543dcc525fc8e03aeab7412124e8749ad2dcf3fdd4724f0a0,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,0.012677907943725586,0.013498783111572266,0.015375614166259766,0.02239394187927246,0.014791488647460938,0.01540231704711914,0.015249252319335938,0.040874481201171875,0.0667579174041748,0.8724172115325928,0.41084837913513184,0.042273759841918945,0.06696009635925293,0.04229903221130371,0.06693911552429199,0.06787490844726562 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,False,Tests_passed,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,True,10,21,66,2,True,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,True,10,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,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,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,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,f4b9f2bc2eae16c543dcc525fc8e03aeab7412124e8749ad2dcf3fdd4724f0a0,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,0.012677907943725586,0.013498783111572266,0.015375614166259766,0.02239394187927246,0.014791488647460938,0.01540231704711914,0.015249252319335938,0.040874481201171875,0.0667579174041748,0.8724172115325928,0.41084837913513184,0.042273759841918945,0.06696009635925293,0.04229903221130371,0.06693911552429199,0.06787490844726562,0.06451201438903809,0.06552529335021973,0.06638360023498535,0.06703472137451172,0.06435537338256836,0.06655025482177734,0.06597375869750977,0.10307145118713379,0.0967550277709961,0.9993293285369873,0.4502694606781006,0.0640418529510498,0.06550073623657227,0.06476545333862305,0.0653696060180664,0.06589746475219727 diff --git a/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv b/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv index 1f58ea326c..e13f6a25a9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,True,8,20,104,2,True,8,Tests_passed,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,True,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,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,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,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,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,6948c55e1512ea7eca4310410b2838eecf55413d46277c5003c529a261a7b494,Tests_failed,1e15def27db13f18f434b0369077b546d96f018d4e0144bc72beb3820f6488c4,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,0.056005239486694336,0.04514741897583008,0.046332597732543945,0.02954864501953125,0.054306745529174805,0.04079461097717285,0.043004751205444336,0.20070981979370117,0.1091008186340332,0.8492782115936279,0.41380763053894043,0.04890084266662598,0.07302403450012207,0.050461769104003906,0.07368230819702148,0.07334375381469727 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,True,8,20,104,2,True,8,Tests_passed,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,True,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,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,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,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,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,6948c55e1512ea7eca4310410b2838eecf55413d46277c5003c529a261a7b494,Tests_failed,1e15def27db13f18f434b0369077b546d96f018d4e0144bc72beb3820f6488c4,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,0.056005239486694336,0.04514741897583008,0.046332597732543945,0.02954864501953125,0.054306745529174805,0.04079461097717285,0.043004751205444336,0.20070981979370117,0.1091008186340332,0.8492782115936279,0.41380763053894043,0.04890084266662598,0.07302403450012207,0.050461769104003906,0.07368230819702148,0.07334375381469727,0.07073783874511719,0.07331228256225586,0.07782101631164551,0.07723712921142578,0.07830309867858887,0.08183717727661133,0.07775616645812988,0.11375975608825684,0.10947799682617188,0.9965698719024658,0.4812469482421875,0.07454514503479004,0.07475924491882324,0.07211470603942871,0.07510519027709961,0.07419610023498535 diff --git a/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv b/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv index 07f02cf0a4..b97901f4fc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,True,True,Tests_passed,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,True,12,49,164.0,3,True,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,True,12,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,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Merge_timedout,,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,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,44c1fc40b260a417c3ac4152bb3bfcdb54ba07bd9cf09db4c8301dc6f834f6e3,Merge_timedout,,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,0.012008905410766602,0.011568069458007812,0.013265132904052734,0.02065443992614746,0.013039112091064453,0.012888669967651367,0.01353764533996582,0.05105161666870117,0.12022519111633301,1.0369830131530762,-1.0,0.03287315368652344,0.08133482933044434,0.041271209716796875,0.08161115646362305,0.0825345516204834 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,True,True,Tests_passed,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,True,12,49,164.0,3,True,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,True,12,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,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Merge_timedout,,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,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,44c1fc40b260a417c3ac4152bb3bfcdb54ba07bd9cf09db4c8301dc6f834f6e3,Merge_timedout,,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,0.012008905410766602,0.011568069458007812,0.013265132904052734,0.02065443992614746,0.013039112091064453,0.012888669967651367,0.01353764533996582,0.05105161666870117,0.12022519111633301,1.0369830131530762,-1.0,0.03287315368652344,0.08133482933044434,0.041271209716796875,0.08161115646362305,0.0825345516204834,0.07697844505310059,0.07927370071411133,0.0700681209564209,0.08116531372070312,0.07780933380126953,0.08018159866333008,0.08043098449707031,0.1333775520324707,0.13481903076171875,1.1623029708862305,-1.0,0.07131767272949219,0.07680940628051758,0.07137393951416016,0.0782015323638916,0.0783233642578125 diff --git a/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv b/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv index f8e6edec37..f6e5039c1a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,True,True,True,5,8,114,2,True,5,Tests_passed,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,True,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,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,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,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,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,5920052a9042839b7a06cb1847a140e6e71daf2cdd001988b8d8a8eaa9fdd813,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,0.010685443878173828,0.010724782943725586,0.01171731948852539,0.01863718032836914,0.011965274810791016,0.011788368225097656,0.011227846145629883,0.03627657890319824,0.06620121002197266,0.6560940742492676,0.26814913749694824,0.035753726959228516,0.058829545974731445,0.03557395935058594,0.057738304138183594,0.0595552921295166 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,True,True,True,5,8,114,2,True,5,Tests_passed,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,True,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,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,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,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,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,5920052a9042839b7a06cb1847a140e6e71daf2cdd001988b8d8a8eaa9fdd813,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,0.010685443878173828,0.010724782943725586,0.01171731948852539,0.01863718032836914,0.011965274810791016,0.011788368225097656,0.011227846145629883,0.03627657890319824,0.06620121002197266,0.6560940742492676,0.26814913749694824,0.035753726959228516,0.058829545974731445,0.03557395935058594,0.057738304138183594,0.0595552921295166,0.0583035945892334,0.05629539489746094,0.06005454063415527,0.058737993240356445,0.05824756622314453,0.0592036247253418,0.05856037139892578,0.0919349193572998,0.09224367141723633,0.7314090728759766,0.3022425174713135,0.0581355094909668,0.05844402313232422,0.0591738224029541,0.05803799629211426,0.05915975570678711 diff --git a/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv b/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv index d87b53ba32..b2dbd6c93a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,True,6,19,128,2,True,6,Tests_passed,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,True,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,True,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,151d651cf8e8730ef818d41eacb050bde94654cca15b8835f0df795b143bf84a,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Tests_failed,ff213464c2e0712a41f939541d450661ea00109ebeddcc27888515910f4d7662,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,9a17774699f976c502d6ab005495a6f2fd33da0b7d910800af405da47e21e967,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,be338c3ee912bbfe931c15044208153e88a1ccbb687c2c2ff55a0ec36a9d2ee4,Tests_failed,513c81519d7a018fa9699fb02b1515027f8cda2ab4d8320d4daecf4db1401eb8,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,0.017364978790283203,0.017603635787963867,0.019686460494995117,0.014643430709838867,0.02026653289794922,0.020314931869506836,0.020175457000732422,0.049180030822753906,0.07663393020629883,0.5442450046539307,0.29529690742492676,0.057115793228149414,0.05753374099731445,0.058548688888549805,0.06169772148132324,0.06204366683959961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,True,6,19,128,2,True,6,Tests_passed,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,True,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,True,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,151d651cf8e8730ef818d41eacb050bde94654cca15b8835f0df795b143bf84a,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Tests_failed,ff213464c2e0712a41f939541d450661ea00109ebeddcc27888515910f4d7662,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,9a17774699f976c502d6ab005495a6f2fd33da0b7d910800af405da47e21e967,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,be338c3ee912bbfe931c15044208153e88a1ccbb687c2c2ff55a0ec36a9d2ee4,Tests_failed,513c81519d7a018fa9699fb02b1515027f8cda2ab4d8320d4daecf4db1401eb8,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,0.017364978790283203,0.017603635787963867,0.019686460494995117,0.014643430709838867,0.02026653289794922,0.020314931869506836,0.020175457000732422,0.049180030822753906,0.07663393020629883,0.5442450046539307,0.29529690742492676,0.057115793228149414,0.05753374099731445,0.058548688888549805,0.06169772148132324,0.06204366683959961,0.054737091064453125,0.05693387985229492,0.058118581771850586,0.05849885940551758,0.06004595756530762,0.04351162910461426,0.05831575393676758,0.09379196166992188,0.09864473342895508,0.6191871166229248,0.33782315254211426,0.05796170234680176,0.05932164192199707,0.05782651901245117,0.05831289291381836,0.05729079246520996 diff --git a/results/combined/merges_timed/jenkinsci/coverity-plugin.csv b/results/combined/merges_timed/jenkinsci/coverity-plugin.csv index 66b234e095..48a0184c86 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -181,refs/heads/master,ab382ea7f87d69826dd1c5281156f1f250c49b44,726ec49044213fb73c4c20e770b1263ec9e2eafa,7fbeb1bfa427f969faf5a0a1bf30cdcf097b669e,,True,True,True,16,73,826,3,True,16,Tests_passed,b165e151199d2bf6b432b877e690983b244b6469e3e743b9e552b8b743062dda,True,Tests_passed,e635af35249f30bcbd9bc7e54b579ae245021b6f7f4f7d2fce1704cae271175e,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,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Tests_failed,8cb60600ad9b8a16e0da75a9a76ac30a45b3c14d6c93280c566cfaff5710bc96,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,050adfa13d2472c0aa7c8f5e69cb9c98f6744d14a7a4d900d8f61e63a44fe8b7,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,f8ff9c99b787b9ef0d071ab1192cfd03681ad62f26de05ce867612d4616d47cd,Tests_failed,1a81f5a7f79f8aa31c465dd5f9b39f76cddd8213904715fff82281a4c284bad4,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,0.048230648040771484,0.05576348304748535,0.05527782440185547,0.02060985565185547,0.05459094047546387,0.049707889556884766,0.05958104133605957,0.23306679725646973,0.17502689361572266,2.049198865890503,0.7906217575073242,0.04690670967102051,0.07339119911193848,0.048406362533569336,0.07654547691345215,0.07551336288452148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +181,refs/heads/master,ab382ea7f87d69826dd1c5281156f1f250c49b44,726ec49044213fb73c4c20e770b1263ec9e2eafa,7fbeb1bfa427f969faf5a0a1bf30cdcf097b669e,,True,True,True,16,73,826,3,True,16,Tests_passed,b165e151199d2bf6b432b877e690983b244b6469e3e743b9e552b8b743062dda,True,Tests_passed,e635af35249f30bcbd9bc7e54b579ae245021b6f7f4f7d2fce1704cae271175e,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,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Tests_failed,8cb60600ad9b8a16e0da75a9a76ac30a45b3c14d6c93280c566cfaff5710bc96,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,050adfa13d2472c0aa7c8f5e69cb9c98f6744d14a7a4d900d8f61e63a44fe8b7,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,f8ff9c99b787b9ef0d071ab1192cfd03681ad62f26de05ce867612d4616d47cd,Tests_failed,1a81f5a7f79f8aa31c465dd5f9b39f76cddd8213904715fff82281a4c284bad4,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,0.048230648040771484,0.05576348304748535,0.05527782440185547,0.02060985565185547,0.05459094047546387,0.049707889556884766,0.05958104133605957,0.23306679725646973,0.17502689361572266,2.049198865890503,0.7906217575073242,0.04690670967102051,0.07339119911193848,0.048406362533569336,0.07654547691345215,0.07551336288452148,0.08504700660705566,0.07236361503601074,0.07576417922973633,0.07577013969421387,0.07425713539123535,0.08151888847351074,0.07276201248168945,0.12279772758483887,0.13549542427062988,2.0898468494415283,0.9019386768341064,0.07119417190551758,0.0731046199798584,0.07174515724182129,0.07432436943054199,0.07417702674865723 diff --git a/results/combined/merges_timed/jenkinsci/credentials-plugin.csv b/results/combined/merges_timed/jenkinsci/credentials-plugin.csv index 8012f6ee92..f9f16ff1fc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,Tests_passed,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,True,10.0,29,223.0,2,True,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,True,10,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,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Tests_passed,c5882bd90b37a67f4e8289513b396cbf290f25cb39f9d7809b289b622ab8ba9a,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,54a6f2831a118503cfc10b39dcad36deb4a94976758847dc95228ed1ca5b9f09,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,46436e983279405181332afdb2e1a5b93f6ee4855a8bc1412f7f3b8cb012dfaf,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,0.012730836868286133,0.012917280197143555,0.06587052345275879,0.02152729034423828,0.06578540802001953,0.06546568870544434,0.06564450263977051,0.08555984497070312,0.07306790351867676,1.112504243850708,0.5106027126312256,0.05754566192626953,0.048934221267700195,0.04947805404663086,0.05060243606567383,0.05008292198181152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,Tests_passed,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,True,10.0,29,223.0,2,True,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,True,10,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,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Tests_passed,c5882bd90b37a67f4e8289513b396cbf290f25cb39f9d7809b289b622ab8ba9a,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,54a6f2831a118503cfc10b39dcad36deb4a94976758847dc95228ed1ca5b9f09,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,46436e983279405181332afdb2e1a5b93f6ee4855a8bc1412f7f3b8cb012dfaf,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,0.012730836868286133,0.012917280197143555,0.06587052345275879,0.02152729034423828,0.06578540802001953,0.06546568870544434,0.06564450263977051,0.08555984497070312,0.07306790351867676,1.112504243850708,0.5106027126312256,0.05754566192626953,0.048934221267700195,0.04947805404663086,0.05060243606567383,0.05008292198181152,0.04899930953979492,0.049549102783203125,0.04748702049255371,0.04929804801940918,0.049936532974243164,0.048822879791259766,0.05097770690917969,0.08176088333129883,0.08277630805969238,1.2197768688201904,0.5438780784606934,0.049245595932006836,0.0585784912109375,0.04817318916320801,0.05005002021789551,0.04901885986328125 diff --git a/results/combined/merges_timed/jenkinsci/deploy-plugin.csv b/results/combined/merges_timed/jenkinsci/deploy-plugin.csv index ca60378c10..33b1beaa3c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,True,28,103,571,15,True,34,Tests_passed,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,True,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,True,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,766113523606078212e8c9bfa18cc99f2ae044b72061cc7144332f649408622c,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,Merge_failed,2b3390a66ca85237c0d258b30a357102c7d9a8b6b35222be46130920425c9395,Merge_failed,8fcb6c3ad92b063197ded64a2ee87979c43b59d62080444af4828f3e8290f023,Merge_failed,96ef33b8f81b4d4dd8039865d88199ff93cf9ce9c92c9344fe8da4e972316c26,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,82520bb2bb7dc714c45803c58cdfc8f2639408fb1fa5526d81d984f5136ce62c,Merge_failed,bebc284f94313a83ffeb38af0893aa029330f1ef1c3b2b63e19c0eebe08d7cdf,Merge_failed,2a6753023bc4f09fd33c547784f0120674719c70c5af2ba42fa607d82f56762e,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,0.010303974151611328,0.010198116302490234,0.009979248046875,0.016864299774169922,0.010492801666259766,0.010199785232543945,0.010049819946289062,0.12209534645080566,0.4678025245666504,3.4567370414733887,0.4963538646697998,0.11589217185974121,0.13232707977294922,0.11574196815490723,0.14573192596435547,0.1548619270324707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,True,28,103,571,15,True,34,Tests_passed,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,True,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,True,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,766113523606078212e8c9bfa18cc99f2ae044b72061cc7144332f649408622c,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,Merge_failed,2b3390a66ca85237c0d258b30a357102c7d9a8b6b35222be46130920425c9395,Merge_failed,8fcb6c3ad92b063197ded64a2ee87979c43b59d62080444af4828f3e8290f023,Merge_failed,96ef33b8f81b4d4dd8039865d88199ff93cf9ce9c92c9344fe8da4e972316c26,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,82520bb2bb7dc714c45803c58cdfc8f2639408fb1fa5526d81d984f5136ce62c,Merge_failed,bebc284f94313a83ffeb38af0893aa029330f1ef1c3b2b63e19c0eebe08d7cdf,Merge_failed,2a6753023bc4f09fd33c547784f0120674719c70c5af2ba42fa607d82f56762e,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,676825870e8433044979fe40a61931ad2ed2455a8fb426587f793919a9428ff0,Merge_failed,8b55dbaa9e3c4419224f742e12061d9e0e04ad659f95583059612facf99f0933,0.010303974151611328,0.010198116302490234,0.009979248046875,0.016864299774169922,0.010492801666259766,0.010199785232543945,0.010049819946289062,0.12209534645080566,0.4678025245666504,3.4567370414733887,0.4963538646697998,0.11589217185974121,0.13232707977294922,0.11574196815490723,0.14573192596435547,0.1548619270324707,0.13872981071472168,0.14920711517333984,0.1355440616607666,0.14911556243896484,0.13677334785461426,0.13781428337097168,0.13646841049194336,0.27632975578308105,0.37632107734680176,3.7240800857543945,0.6390788555145264,0.1385045051574707,0.13862991333007812,0.14181137084960938,0.13730406761169434,0.1506049633026123 diff --git a/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv b/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv index dfb6482e07..c5fe4dddb8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,True,27,84,252,5,True,27,Tests_passed,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,True,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,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,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,d851b31804aa42296cfc61162d78ff7d64e8227d345ee4cbb80b060809b0d2e4,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,0.018248558044433594,0.018541812896728516,0.023703336715698242,0.03168535232543945,0.02346634864807129,0.023476600646972656,0.022852182388305664,0.09402203559875488,0.23214983940124512,3.619020700454712,0.7064347267150879,0.0588991641998291,0.13268256187438965,0.0585331916809082,0.1544797420501709,0.13557076454162598 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,True,27,84,252,5,True,27,Tests_passed,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,True,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,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,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,d851b31804aa42296cfc61162d78ff7d64e8227d345ee4cbb80b060809b0d2e4,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,Tests_passed,8829a98fd369bf72f0dfbdb85b0f55f162c1a2c9c65bdc12485e3bbb842e706d,0.018248558044433594,0.018541812896728516,0.023703336715698242,0.03168535232543945,0.02346634864807129,0.023476600646972656,0.022852182388305664,0.09402203559875488,0.23214983940124512,3.619020700454712,0.7064347267150879,0.0588991641998291,0.13268256187438965,0.0585331916809082,0.1544797420501709,0.13557076454162598,0.11876320838928223,0.14038443565368652,0.14760136604309082,0.15041399002075195,0.14873242378234863,0.1429593563079834,0.14716672897338867,0.23882055282592773,0.24113011360168457,3.8850927352905273,0.772728681564331,0.14642739295959473,0.1430649757385254,0.14290142059326172,0.13881611824035645,0.14350295066833496 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 1df13f3a4e..8aa710aef9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,False,True,12,34,158,2,True,12,Tests_passed,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,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,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,e9813d280f8a16194d53a95a5a94b2642cc045f0731de3e1e3ecbb2ac3e1cfd0,Tests_failed,e2b80dd36b4af067ed51412994221128fd2095b4c2e9b60099c121ae8938d654,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,0.03667402267456055,0.037560462951660156,0.04653191566467285,0.019160032272338867,0.0393064022064209,0.0572206974029541,0.048683881759643555,0.176513671875,0.10730195045471191,1.1228153705596924,0.35436153411865234,0.03550291061401367,0.06473016738891602,0.03563642501831055,0.06288814544677734,0.06347298622131348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,False,True,12,34,158,2,True,12,Tests_passed,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,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,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,e9813d280f8a16194d53a95a5a94b2642cc045f0731de3e1e3ecbb2ac3e1cfd0,Tests_failed,e2b80dd36b4af067ed51412994221128fd2095b4c2e9b60099c121ae8938d654,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,Tests_passed,19d33cdc0e966ab9559114a23767be80846317a9e2aa8e789533bd69718c58d2,0.03667402267456055,0.037560462951660156,0.04653191566467285,0.019160032272338867,0.0393064022064209,0.0572206974029541,0.048683881759643555,0.176513671875,0.10730195045471191,1.1228153705596924,0.35436153411865234,0.03550291061401367,0.06473016738891602,0.03563642501831055,0.06288814544677734,0.06347298622131348,0.06433653831481934,0.0641627311706543,0.06653451919555664,0.0652930736541748,0.06560325622558594,0.06467866897583008,0.0657186508178711,0.0966343879699707,0.09807348251342773,1.29201078414917,0.41191530227661133,0.06572365760803223,0.06292414665222168,0.06264305114746094,0.0642094612121582,0.06466412544250488 diff --git a/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv b/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv index 2f462f9469..dc0e4ce48f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,True,21,145,1700,4,True,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,True,21,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,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,c43b3ac876b5e9fa36e719256da282c49f36cacbf975c1bd2fea07e999d8fa36,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,8a4c71b8b82a7f752f1a8807dfbb316e38fd226e5a1d8843f646b774e623716a,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,0.03819561004638672,0.05759453773498535,0.05283999443054199,0.020365476608276367,0.03683829307556152,0.02724432945251465,0.05631422996520996,0.3396117687225342,0.23930096626281738,1.307088851928711,0.6791543960571289,0.05625772476196289,0.09120941162109375,0.04845929145812988,0.08980202674865723,0.10637140274047852 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,True,21,145,1700,4,True,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,True,21,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,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,c43b3ac876b5e9fa36e719256da282c49f36cacbf975c1bd2fea07e999d8fa36,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,8a4c71b8b82a7f752f1a8807dfbb316e38fd226e5a1d8843f646b774e623716a,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,e0fb303ce20b43bc0e38acd8ba63c6b1b225e5379aa0823716a806024a644760,0.03819561004638672,0.05759453773498535,0.05283999443054199,0.020365476608276367,0.03683829307556152,0.02724432945251465,0.05631422996520996,0.3396117687225342,0.23930096626281738,1.307088851928711,0.6791543960571289,0.05625772476196289,0.09120941162109375,0.04845929145812988,0.08980202674865723,0.10637140274047852,0.08349609375,0.1030583381652832,0.08825159072875977,0.102294921875,0.08566045761108398,0.08900094032287598,0.0902254581451416,0.1517500877380371,0.16502046585083008,1.3760364055633545,0.7647228240966797,0.13599562644958496,0.08610153198242188,0.12821578979492188,0.08662295341491699,0.1266765594482422 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 52f26981bb..1e53320efc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,True,14,26,387,3,True,15,Tests_passed,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,True,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,True,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,e0e8d99415622abc47a1e5e69151562867d98d6ae15daf5c3d91c0ca74914e7b,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,8fbd39811c8662ad13c6d4cdd656b2cbf8e2438f005e034c8e0203676a38d1d9,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,0.010234832763671875,0.010677814483642578,0.010470390319824219,0.016160964965820312,0.010415077209472656,0.0103912353515625,0.010629415512084961,0.03777790069580078,0.06633734703063965,0.46724987030029297,0.36759257316589355,0.03660321235656738,0.038344383239746094,0.037483930587768555,0.038201093673706055,0.03936576843261719 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,True,14,26,387,3,True,15,Tests_passed,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,True,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,True,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,e0e8d99415622abc47a1e5e69151562867d98d6ae15daf5c3d91c0ca74914e7b,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,8fbd39811c8662ad13c6d4cdd656b2cbf8e2438f005e034c8e0203676a38d1d9,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,0.010234832763671875,0.010677814483642578,0.010470390319824219,0.016160964965820312,0.010415077209472656,0.0103912353515625,0.010629415512084961,0.03777790069580078,0.06633734703063965,0.46724987030029297,0.36759257316589355,0.03660321235656738,0.038344383239746094,0.037483930587768555,0.038201093673706055,0.03936576843261719,0.03522825241088867,0.03547024726867676,0.03726792335510254,0.03621625900268555,0.03571605682373047,0.036597490310668945,0.035793304443359375,0.0703737735748291,0.07222580909729004,0.531590461730957,0.4253530502319336,0.03647875785827637,0.03655552864074707,0.0362553596496582,0.03600621223449707,0.03644967079162598 diff --git a/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv b/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv index a51e8a4ed4..fbeb71b81c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,True,10,55,158,10,True,11,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,True,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,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_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,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,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,0.046300649642944336,0.042428016662597656,0.03984546661376953,0.018747806549072266,0.027707576751708984,0.047507286071777344,0.042191505432128906,0.10279989242553711,0.041196346282958984,0.049513816833496094,0.528160810470581,0.03903675079345703,0.1976461410522461,0.03762531280517578,0.19809627532958984,0.19988536834716797 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,True,10,55,158,10,True,11,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,True,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,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_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,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,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,0.046300649642944336,0.042428016662597656,0.03984546661376953,0.018747806549072266,0.027707576751708984,0.047507286071777344,0.042191505432128906,0.10279989242553711,0.041196346282958984,0.049513816833496094,0.528160810470581,0.03903675079345703,0.1976461410522461,0.03762531280517578,0.19809627532958984,0.19988536834716797,0.19765758514404297,0.2017366886138916,0.1986865997314453,0.19662070274353027,0.1876842975616455,0.20013856887817383,0.1958940029144287,0.21826791763305664,0.2105097770690918,0.21510553359985352,0.6352379322052002,0.1982269287109375,0.1980583667755127,0.19957494735717773,0.1979367733001709,0.19863295555114746 diff --git a/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv b/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv index 9f7043d713..db38ba2417 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,Tests_passed,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,True,11,27,190,2,True,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,True,11,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,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,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,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,e93c8aa5e9f582555c6068c3b11e0cf2d590bc0deb90ed2deb383555017e782e,Tests_failed,bfb10be7f73e3391a1a17560c8ef41d9225f315a197a3f88c1c92206f0fdb22c,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,0.047794342041015625,0.050707101821899414,0.04397988319396973,0.019514799118041992,0.033890485763549805,0.04804682731628418,0.04433393478393555,0.1749563217163086,0.11424827575683594,0.6564257144927979,0.4354219436645508,0.03515338897705078,0.06026053428649902,0.036878347396850586,0.059446096420288086,0.05983424186706543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,Tests_passed,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,True,11,27,190,2,True,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,True,11,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,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,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,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,e93c8aa5e9f582555c6068c3b11e0cf2d590bc0deb90ed2deb383555017e782e,Tests_failed,bfb10be7f73e3391a1a17560c8ef41d9225f315a197a3f88c1c92206f0fdb22c,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,0.047794342041015625,0.050707101821899414,0.04397988319396973,0.019514799118041992,0.033890485763549805,0.04804682731628418,0.04433393478393555,0.1749563217163086,0.11424827575683594,0.6564257144927979,0.4354219436645508,0.03515338897705078,0.06026053428649902,0.036878347396850586,0.059446096420288086,0.05983424186706543,0.05827069282531738,0.05696892738342285,0.059735774993896484,0.06009244918823242,0.05851578712463379,0.05894351005554199,0.05986499786376953,0.09430456161499023,0.08880400657653809,0.7058680057525635,0.48151564598083496,0.05858492851257324,0.05825662612915039,0.05662274360656738,0.05799603462219238,0.05880117416381836 diff --git a/results/combined/merges_timed/jenkinsci/jira-plugin.csv b/results/combined/merges_timed/jenkinsci/jira-plugin.csv index cb27541b6a..1755e5a3f0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,True,35,154,831.0,3,True,35,Tests_passed,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,True,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,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,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,5c8bd87560225c8078ed43ebbc0c8e0263cbb06d1e3859c40264749cd4b97119,Tests_failed,4174fe603d84d6ee3f416d1198de95b3c3b81fc643126379d98b38c98eb1f315,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,0.014419317245483398,0.015277624130249023,0.016493558883666992,0.022935152053833008,0.015999794006347656,0.016013145446777344,0.0162353515625,0.05554032325744629,0.11978411674499512,1.7181119918823242,0.6004526615142822,0.03826022148132324,0.09009099006652832,0.04426002502441406,0.09457898139953613,0.08923530578613281 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,True,35,154,831.0,3,True,35,Tests_passed,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,True,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,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,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,5c8bd87560225c8078ed43ebbc0c8e0263cbb06d1e3859c40264749cd4b97119,Tests_failed,4174fe603d84d6ee3f416d1198de95b3c3b81fc643126379d98b38c98eb1f315,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,7a9d9d4395a419b73b13cb9ebf810af352a84b5755f332ab8dee7e97333ce82e,Tests_passed,9e7d994984320d3227fbe0ed4156ed668628fc242841253b2f0d9abda06ebfc2,0.014419317245483398,0.015277624130249023,0.016493558883666992,0.022935152053833008,0.015999794006347656,0.016013145446777344,0.0162353515625,0.05554032325744629,0.11978411674499512,1.7181119918823242,0.6004526615142822,0.03826022148132324,0.09009099006652832,0.04426002502441406,0.09457898139953613,0.08923530578613281,0.09163045883178711,0.08718991279602051,0.09470152854919434,0.09521341323852539,0.09088850021362305,0.08970904350280762,0.08981823921203613,0.1482999324798584,0.14719653129577637,1.9492413997650146,0.664546012878418,0.09004878997802734,0.08923959732055664,0.08845090866088867,0.09248590469360352,0.0900423526763916 diff --git a/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv b/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv index a21e7c6bd0..aa23a78e83 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,True,25,129,1307.0,3,True,25,Tests_passed,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,True,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,7a1a9f66b22e0001e5c7a1bd0518b7697f44a82204a70652981b5747f5f1e18b,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,f5efb41ff2e1134974ee35eabed3e6b9f105897d9fc7b626379f6cc6ec640f2e,Merge_timedout,,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,0.07540559768676758,0.01395559310913086,0.0915689468383789,0.11224675178527832,0.09095644950866699,0.09123349189758301,0.09136009216308594,0.14117789268493652,0.18657612800598145,1.8643519878387451,-1.0,0.15595459938049316,0.14846539497375488,0.1612398624420166,0.24313950538635254,0.12344980239868164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,True,25,129,1307.0,3,True,25,Tests_passed,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,True,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,7a1a9f66b22e0001e5c7a1bd0518b7697f44a82204a70652981b5747f5f1e18b,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,f5efb41ff2e1134974ee35eabed3e6b9f105897d9fc7b626379f6cc6ec640f2e,Merge_timedout,,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,Tests_passed,a9429e0f2d5671efb5c650a18d67d8adca609636c2085369c89f12af9c4ea0ac,0.07540559768676758,0.01395559310913086,0.0915689468383789,0.11224675178527832,0.09095644950866699,0.09123349189758301,0.09136009216308594,0.14117789268493652,0.18657612800598145,1.8643519878387451,-1.0,0.15595459938049316,0.14846539497375488,0.1612398624420166,0.24313950538635254,0.12344980239868164,0.2470252513885498,0.23557186126708984,0.12025642395019531,0.25534558296203613,0.25363588333129883,0.18601489067077637,0.2626302242279053,0.22420358657836914,0.33874940872192383,2.0700182914733887,-1.0,0.16927051544189453,0.12024378776550293,0.24774551391601562,0.23841214179992676,0.17674875259399414 diff --git a/results/combined/merges_timed/jenkinsci/junit-plugin.csv b/results/combined/merges_timed/jenkinsci/junit-plugin.csv index c6e2713456..6de2ddec59 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,Tests_passed,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,True,17,143,534.0,2,True,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,True,17,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,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,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_failed,e6f9ec58d1a2fe8a4b16f0ae63f62c86fd057ddc6810c08dc8767f9e53873025,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,0.03512287139892578,0.014127492904663086,0.04641914367675781,0.021744966506958008,0.04647469520568848,0.014190196990966797,0.0465397834777832,0.06742024421691895,0.09061408042907715,1.0644755363464355,-1.0,0.04150247573852539,0.06656694412231445,0.04114890098571777,0.0693366527557373,0.06969809532165527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,Tests_passed,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,True,17,143,534.0,2,True,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,True,17,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,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,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_failed,e6f9ec58d1a2fe8a4b16f0ae63f62c86fd057ddc6810c08dc8767f9e53873025,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,0.03512287139892578,0.014127492904663086,0.04641914367675781,0.021744966506958008,0.04647469520568848,0.014190196990966797,0.0465397834777832,0.06742024421691895,0.09061408042907715,1.0644755363464355,-1.0,0.04150247573852539,0.06656694412231445,0.04114890098571777,0.0693366527557373,0.06969809532165527,0.06627607345581055,0.06746816635131836,0.07022714614868164,0.07010388374328613,0.06834006309509277,0.06853246688842773,0.06737732887268066,0.10793495178222656,0.10291814804077148,1.4409751892089844,-1.0,0.0713968276977539,0.06679439544677734,0.06686639785766602,0.0665140151977539,0.06846785545349121 diff --git a/results/combined/merges_timed/jenkinsci/ldap-plugin.csv b/results/combined/merges_timed/jenkinsci/ldap-plugin.csv index 6c655822b4..7afc2729fa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -123,refs/remotes/origin/pull/221,fd4cb463ba89f3a6b95707c4cc713d02e45c96e7,7552866a43fa4194b33298c432a1df15bd2e4b34,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,True,15,59,327.0,4,True,15,Tests_passed,c678ebd0a70f05c5dd7a9f6f67b4965483c1fb1c78174bea1d08fc78780033d3,True,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,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,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_failed,409b44576320bfce7736f21751fcb065feb92f02e8095d419b129829a6873150,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,e25aa8b6bb553883be870f71e351aba183bf00457f506c37438fbb383b5b404b,Tests_failed,409b44576320bfce7736f21751fcb065feb92f02e8095d419b129829a6873150,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,0.017994165420532227,0.01909661293029785,0.021667003631591797,0.020077228546142578,0.021820783615112305,0.022464275360107422,0.02187180519104004,0.0770258903503418,0.17847466468811035,3.612011194229126,0.7481083869934082,0.054965972900390625,0.1269395351409912,0.05455207824707031,0.1222524642944336,0.14852690696716309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +123,refs/remotes/origin/pull/221,fd4cb463ba89f3a6b95707c4cc713d02e45c96e7,7552866a43fa4194b33298c432a1df15bd2e4b34,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,True,15,59,327.0,4,True,15,Tests_passed,c678ebd0a70f05c5dd7a9f6f67b4965483c1fb1c78174bea1d08fc78780033d3,True,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,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,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_failed,409b44576320bfce7736f21751fcb065feb92f02e8095d419b129829a6873150,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,e25aa8b6bb553883be870f71e351aba183bf00457f506c37438fbb383b5b404b,Tests_failed,409b44576320bfce7736f21751fcb065feb92f02e8095d419b129829a6873150,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,Tests_passed,aa1ccc8c5afb105c697cb26ed76dc99bfab7113a063b9e62e43c158346a118c3,0.017994165420532227,0.01909661293029785,0.021667003631591797,0.020077228546142578,0.021820783615112305,0.022464275360107422,0.02187180519104004,0.0770258903503418,0.17847466468811035,3.612011194229126,0.7481083869934082,0.054965972900390625,0.1269395351409912,0.05455207824707031,0.1222524642944336,0.14852690696716309,0.13555145263671875,0.13042020797729492,0.11742353439331055,0.13808560371398926,0.13897991180419922,0.13239407539367676,0.13446855545043945,0.21543025970458984,0.20173931121826172,3.8479931354522705,0.7753806114196777,0.11504077911376953,0.1347944736480713,0.1392650604248047,0.12133073806762695,0.13412976264953613 diff --git a/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv b/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv index 01c99f1bf8..ad7af05e72 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,True,15,73,291,4,True,15,Tests_passed,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,True,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,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,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Tests_failed,4854fd361dd4337592a341e97f427ed13172da8b4710e1146c7c665479d88d0f,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,c075e9c00c20dd23fe0f9516f4194df601dfecdb76b33ee3ed1797e33a4dd103,Tests_failed,84637d1453aa4581e210b596c29c99f0607d471dde28a58db1cdb4bd4c3281f8,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,0.009721040725708008,0.009544849395751953,0.009685516357421875,0.01609969139099121,0.009557723999023438,0.01011037826538086,0.010057687759399414,0.06022191047668457,0.1729588508605957,2.170079469680786,0.5423581600189209,0.043489933013916016,0.09565377235412598,0.042170047760009766,0.09650588035583496,0.096954345703125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,True,15,73,291,4,True,15,Tests_passed,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,True,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,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,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Tests_failed,4854fd361dd4337592a341e97f427ed13172da8b4710e1146c7c665479d88d0f,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,c075e9c00c20dd23fe0f9516f4194df601dfecdb76b33ee3ed1797e33a4dd103,Tests_failed,84637d1453aa4581e210b596c29c99f0607d471dde28a58db1cdb4bd4c3281f8,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,9032afd7c53c75f7b5bd9b886b3f8baadba7d6c90f1949efa6221cd5c5d59e9a,Tests_passed,8fa054509e2500fd7e326fe2d524a34c3c3d52d73b4d9d028c0ea613631fbba5,0.009721040725708008,0.009544849395751953,0.009685516357421875,0.01609969139099121,0.009557723999023438,0.01011037826538086,0.010057687759399414,0.06022191047668457,0.1729588508605957,2.170079469680786,0.5423581600189209,0.043489933013916016,0.09565377235412598,0.042170047760009766,0.09650588035583496,0.096954345703125,0.09189248085021973,0.08999443054199219,0.09166693687438965,0.09021282196044922,0.09180808067321777,0.0931851863861084,0.09065389633178711,0.1553800106048584,0.17543458938598633,2.3461179733276367,0.6455509662628174,0.09283804893493652,0.09169578552246094,0.0923609733581543,0.09069681167602539,0.09274172782897949 diff --git a/results/combined/merges_timed/jenkinsci/mailer-plugin.csv b/results/combined/merges_timed/jenkinsci/mailer-plugin.csv index 3afb9f07b8..beda4ff31f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,Tests_passed,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,True,4,10,27.0,3,True,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,True,4,True,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,6fe5e06a9fbf2177ec70c9b280f66c9989a72c2252bb7f8b4fe6af999ec4d90d,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,Merge_failed,060266f51b031ae48b9d1023425f4769d3b2a1d3d8354c52fcaadf760811ab47,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,294ec0ff193037dbe860623b9f074bd80516720355ee629db69b801486f8d7b7,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,a555c00fe21a58aaa6c9bedfbfaaf6d8dc476c7d089e3734181c43c99c6dd603,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,0.011716604232788086,0.011257410049438477,0.011705875396728516,0.02006673812866211,0.011629819869995117,0.012204408645629883,0.012160539627075195,0.0511624813079834,0.12544035911560059,1.1870241165161133,0.3569762706756592,0.05559706687927246,0.05998349189758301,0.052145957946777344,0.0603330135345459,0.05985283851623535 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,Tests_passed,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,True,4,10,27.0,3,True,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,True,4,True,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,6fe5e06a9fbf2177ec70c9b280f66c9989a72c2252bb7f8b4fe6af999ec4d90d,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,Merge_failed,060266f51b031ae48b9d1023425f4769d3b2a1d3d8354c52fcaadf760811ab47,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,294ec0ff193037dbe860623b9f074bd80516720355ee629db69b801486f8d7b7,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,a555c00fe21a58aaa6c9bedfbfaaf6d8dc476c7d089e3734181c43c99c6dd603,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,0.011716604232788086,0.011257410049438477,0.011705875396728516,0.02006673812866211,0.011629819869995117,0.012204408645629883,0.012160539627075195,0.0511624813079834,0.12544035911560059,1.1870241165161133,0.3569762706756592,0.05559706687927246,0.05998349189758301,0.052145957946777344,0.0603330135345459,0.05985283851623535,0.05217623710632324,0.05692934989929199,0.05247783660888672,0.05624270439147949,0.05891728401184082,0.05791735649108887,0.05759882926940918,0.09925031661987305,0.12955069541931152,1.3162589073181152,0.4179551601409912,0.05779457092285156,0.0532689094543457,0.05492830276489258,0.052076101303100586,0.05875444412231445 diff --git a/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv b/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv index 67b07bb7cc..01fe7a06bb 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -181,refs/remotes/origin/pull/323,67abe2c502f27a1b6676e7e5ffdc5f0544ab1f5f,a3302aa4a69f1db5f3a843fa2bf48eb0ea6d84de,f4e6886ff1d6eabff84a03b78f0e8a2aae9a0dee,,True,True,Tests_passed,903206fac46e8412fac58fda3ea664cffc390795edd477f4e133cc496dab4b8d,True,2,11,100,3,True,Tests_passed,b07f7512f3e2b0fd7c9b93a8b0c27ee475595e530cb40c14c8d9711895a32bc1,True,3,True,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,81b8afe0da8eeb63a69b81137ccb27eb97d8cc18dfcf838ced9b4c8b462eb6da,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,abc0d01c8d1a84ee4b463c584fac98bef753d7b813c9ef510318c710d2f6ddd0,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,dbdb1580b2d6ed21703a70b4b241f0bb69b0a790361ff97f98f7646c1b73b079,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,0.012847661972045898,0.0126190185546875,0.013224363327026367,0.01948070526123047,0.01372528076171875,0.014285087585449219,0.014081716537475586,0.045313358306884766,0.07057023048400879,0.5301423072814941,0.24227356910705566,0.03931760787963867,0.04084634780883789,0.03296303749084473,0.03784894943237305,0.04050922393798828 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +181,refs/remotes/origin/pull/323,67abe2c502f27a1b6676e7e5ffdc5f0544ab1f5f,a3302aa4a69f1db5f3a843fa2bf48eb0ea6d84de,f4e6886ff1d6eabff84a03b78f0e8a2aae9a0dee,,True,True,Tests_passed,903206fac46e8412fac58fda3ea664cffc390795edd477f4e133cc496dab4b8d,True,2,11,100,3,True,Tests_passed,b07f7512f3e2b0fd7c9b93a8b0c27ee475595e530cb40c14c8d9711895a32bc1,True,3,True,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,81b8afe0da8eeb63a69b81137ccb27eb97d8cc18dfcf838ced9b4c8b462eb6da,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,abc0d01c8d1a84ee4b463c584fac98bef753d7b813c9ef510318c710d2f6ddd0,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,dbdb1580b2d6ed21703a70b4b241f0bb69b0a790361ff97f98f7646c1b73b079,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,0.012847661972045898,0.0126190185546875,0.013224363327026367,0.01948070526123047,0.01372528076171875,0.014285087585449219,0.014081716537475586,0.045313358306884766,0.07057023048400879,0.5301423072814941,0.24227356910705566,0.03931760787963867,0.04084634780883789,0.03296303749084473,0.03784894943237305,0.04050922393798828,0.03920912742614746,0.03387141227722168,0.040355682373046875,0.0390324592590332,0.039154052734375,0.0371854305267334,0.031816720962524414,0.0735471248626709,0.0668787956237793,0.5353405475616455,0.2725822925567627,0.03793478012084961,0.04005718231201172,0.03840827941894531,0.03741097450256348,0.03336334228515625 diff --git a/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv b/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv index 8f7c24bb41..91b834d40b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,True,False,Tests_passed,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,True,7,13,22,2,True,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,True,7,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,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,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,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,713c65569228171546830142a33654b90f1b2623b40d8ac292ea98bf0e6e3f0d,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,0.012492179870605469,0.01269221305847168,0.015578985214233398,0.02360248565673828,0.015403509140014648,0.015561103820800781,0.015411138534545898,0.042191505432128906,0.06831741333007812,0.625678300857544,0.427431583404541,0.042226552963256836,0.06639361381530762,0.04332685470581055,0.06313467025756836,0.06698989868164062 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,True,False,Tests_passed,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,True,7,13,22,2,True,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,True,7,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,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,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,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,713c65569228171546830142a33654b90f1b2623b40d8ac292ea98bf0e6e3f0d,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,0.012492179870605469,0.01269221305847168,0.015578985214233398,0.02360248565673828,0.015403509140014648,0.015561103820800781,0.015411138534545898,0.042191505432128906,0.06831741333007812,0.625678300857544,0.427431583404541,0.042226552963256836,0.06639361381530762,0.04332685470581055,0.06313467025756836,0.06698989868164062,0.053827524185180664,0.06333684921264648,0.0673985481262207,0.0630025863647461,0.06807756423950195,0.06757616996765137,0.06658720970153809,0.10238814353942871,0.08476543426513672,0.7438979148864746,0.4713759422302246,0.06600499153137207,0.06407499313354492,0.06221580505371094,0.06528139114379883,0.06334114074707031 diff --git a/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv b/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv index 776f358f87..e3f3bf664f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,Tests_passed,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,True,6,10,59,3,True,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,True,6,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,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,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,e3dedf8e370b786a97def0eedf524e41ec67a5613cf5b10b3704c2ecd1e78735,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,0.04579353332519531,0.04236292839050293,0.04701399803161621,0.01586127281188965,0.04216194152832031,0.04418683052062988,0.0454404354095459,0.23775672912597656,0.17183160781860352,1.830491542816162,0.3748478889465332,0.030503273010253906,0.07703948020935059,0.030905961990356445,0.07686281204223633,0.07665205001831055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,Tests_passed,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,True,6,10,59,3,True,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,True,6,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,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,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,e3dedf8e370b786a97def0eedf524e41ec67a5613cf5b10b3704c2ecd1e78735,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,0.04579353332519531,0.04236292839050293,0.04701399803161621,0.01586127281188965,0.04216194152832031,0.04418683052062988,0.0454404354095459,0.23775672912597656,0.17183160781860352,1.830491542816162,0.3748478889465332,0.030503273010253906,0.07703948020935059,0.030905961990356445,0.07686281204223633,0.07665205001831055,0.07231354713439941,0.07287335395812988,0.07230877876281738,0.07226157188415527,0.0726006031036377,0.07275986671447754,0.07379531860351562,0.12174177169799805,0.12460160255432129,1.875288486480713,0.4122481346130371,0.07341432571411133,0.07404494285583496,0.07258224487304688,0.07447600364685059,0.0736534595489502 diff --git a/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv b/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv index 34a50039c3..77b4375432 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,True,5,15,46,10,True,11,Tests_passed,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,True,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,True,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,29e8f712f7498b4ce8934980ee5269722aa7bf91c67d95911d57f695b598b25d,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,64ad138670e6427c0f2e5853fbc8f61737a15245c4718ffa7470ed921707e537,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f8d4a5f834a7efbeaba31d52c2ad45569e3607d684b956d9eb91f421db954709,Tests_failed,e9f8f9d8cb67d16b55c935d9e4e558ca5c39733221cd76efcf9cf44b5658c991,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,0.037672996520996094,0.036737680435180664,0.03862285614013672,0.014485359191894531,0.04468488693237305,0.03654122352600098,0.041373252868652344,0.29058074951171875,0.24038410186767578,2.5889248847961426,0.5207059383392334,0.0531313419342041,0.07718682289123535,0.05351591110229492,0.0770258903503418,0.07908225059509277 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,True,5,15,46,10,True,11,Tests_passed,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,True,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,True,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,29e8f712f7498b4ce8934980ee5269722aa7bf91c67d95911d57f695b598b25d,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,64ad138670e6427c0f2e5853fbc8f61737a15245c4718ffa7470ed921707e537,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f8d4a5f834a7efbeaba31d52c2ad45569e3607d684b956d9eb91f421db954709,Tests_failed,e9f8f9d8cb67d16b55c935d9e4e558ca5c39733221cd76efcf9cf44b5658c991,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,0.037672996520996094,0.036737680435180664,0.03862285614013672,0.014485359191894531,0.04468488693237305,0.03654122352600098,0.041373252868652344,0.29058074951171875,0.24038410186767578,2.5889248847961426,0.5207059383392334,0.0531313419342041,0.07718682289123535,0.05351591110229492,0.0770258903503418,0.07908225059509277,0.07773971557617188,0.07680821418762207,0.07522320747375488,0.07563161849975586,0.0770711898803711,0.07704973220825195,0.0754694938659668,0.14015579223632812,0.17499399185180664,2.9729862213134766,0.6750717163085938,0.07760906219482422,0.07605195045471191,0.0767219066619873,0.0771486759185791,0.07700967788696289 diff --git a/results/combined/merges_timed/jenkinsci/plot-plugin.csv b/results/combined/merges_timed/jenkinsci/plot-plugin.csv index 91327921c7..b177aee377 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,True,33,89,640,3,True,33,Tests_passed,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,True,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,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_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,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_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,ab30ec965b22351e32974c954ebb28ab83a289fb46f3c37cd875720e34d6b0e9,Tests_failed,b4464decb03a3df4059c1f5c3aeec58113004fa04744c9b6e581904b23d51720,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,0.013599395751953125,0.01356816291809082,0.014861583709716797,0.02548694610595703,0.015224933624267578,0.014503002166748047,0.01479482650756836,0.053110361099243164,0.12256264686584473,2.021440267562866,0.6300594806671143,0.04283618927001953,0.09020543098449707,0.04216766357421875,0.08925890922546387,0.09216761589050293 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,True,33,89,640,3,True,33,Tests_passed,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,True,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,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_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,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_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,ab30ec965b22351e32974c954ebb28ab83a289fb46f3c37cd875720e34d6b0e9,Tests_failed,b4464decb03a3df4059c1f5c3aeec58113004fa04744c9b6e581904b23d51720,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,0.013599395751953125,0.01356816291809082,0.014861583709716797,0.02548694610595703,0.015224933624267578,0.014503002166748047,0.01479482650756836,0.053110361099243164,0.12256264686584473,2.021440267562866,0.6300594806671143,0.04283618927001953,0.09020543098449707,0.04216766357421875,0.08925890922546387,0.09216761589050293,0.08791375160217285,0.08970379829406738,0.08377623558044434,0.08825969696044922,0.0868082046508789,0.08727240562438965,0.08536791801452637,0.14080500602722168,0.14304780960083008,2.1860949993133545,0.680539608001709,0.08595800399780273,0.08610749244689941,0.08699965476989746,0.08632707595825195,0.08882617950439453 diff --git a/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv b/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv index 805ca9d524..cb60c8f53b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,True,False,True,3,8,26.0,2,True,3,Tests_passed,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,True,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,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,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Tests_passed,9a5d68f27b5d0430566710d5208c09546e8ab84bbaa38b4ba9ccadcf349e78a3,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,e04116988976826fe6ced17f63f11a73a2239a8b931301a303b5999d2f9f097c,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,ca32f909f333fd550a98ff95bd1a4df44d3b7f275653ec096d5d92bf80cf8be6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,0.04456949234008789,0.04310798645019531,0.04223942756652832,0.014220952987670898,0.03853011131286621,0.044621944427490234,0.033077239990234375,0.13556170463562012,0.11705183982849121,1.042269229888916,0.3640420436859131,0.0731346607208252,0.05241274833679199,0.04065132141113281,0.04445075988769531,0.056201934814453125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,True,False,True,3,8,26.0,2,True,3,Tests_passed,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,True,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,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,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Tests_passed,9a5d68f27b5d0430566710d5208c09546e8ab84bbaa38b4ba9ccadcf349e78a3,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,e04116988976826fe6ced17f63f11a73a2239a8b931301a303b5999d2f9f097c,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,ca32f909f333fd550a98ff95bd1a4df44d3b7f275653ec096d5d92bf80cf8be6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,0.04456949234008789,0.04310798645019531,0.04223942756652832,0.014220952987670898,0.03853011131286621,0.044621944427490234,0.033077239990234375,0.13556170463562012,0.11705183982849121,1.042269229888916,0.3640420436859131,0.0731346607208252,0.05241274833679199,0.04065132141113281,0.04445075988769531,0.056201934814453125,0.05185389518737793,0.040955305099487305,0.051526784896850586,0.04199957847595215,0.042542457580566406,0.0542445182800293,0.04035162925720215,0.08539628982543945,0.0956580638885498,1.060272216796875,0.4369359016418457,0.049870967864990234,0.04225659370422363,0.041821956634521484,0.05012226104736328,0.04078793525695801 diff --git a/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv b/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv index 257e821309..0ff9d49de1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,True,14,33,240,2,True,14,Tests_passed,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,True,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,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,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,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,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,f61ce7b8e93bb62ae93991fd05251d1eb8628cefb46045fdd4aab6a162676201,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,0.010820150375366211,0.011069297790527344,0.012006521224975586,0.018456697463989258,0.011603355407714844,0.011385202407836914,0.011369705200195312,0.036032915115356445,0.06627774238586426,0.9948873519897461,0.47164249420166016,0.03630852699279785,0.06144881248474121,0.03605842590332031,0.06431126594543457,0.061604976654052734 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,True,14,33,240,2,True,14,Tests_passed,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,True,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,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,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,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,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,f61ce7b8e93bb62ae93991fd05251d1eb8628cefb46045fdd4aab6a162676201,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,0.010820150375366211,0.011069297790527344,0.012006521224975586,0.018456697463989258,0.011603355407714844,0.011385202407836914,0.011369705200195312,0.036032915115356445,0.06627774238586426,0.9948873519897461,0.47164249420166016,0.03630852699279785,0.06144881248474121,0.03605842590332031,0.06431126594543457,0.061604976654052734,0.05918097496032715,0.05760502815246582,0.0579833984375,0.05930137634277344,0.05889606475830078,0.059478044509887695,0.05938887596130371,0.09147882461547852,0.09005451202392578,1.0666210651397705,0.49500465393066406,0.057851314544677734,0.05940961837768555,0.06090855598449707,0.06165814399719238,0.0602264404296875 diff --git a/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv b/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv index 920225a9e6..3d3ff15de4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,True,10,21,100,6,True,10,Tests_passed,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,True,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,True,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,4a99ebc6e6d72fc46608dc9b97e88820f08df5c89113ac4f6330e78a5a3ab031,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,2e3d2c1da99c8494d37fb6bc3ca6569504218be7539e432a5ee904213f1819a2,Merge_failed,aa1fe8cdfd0cd3ebdd8a68e6e36430a41454bf342db581790b70f3fac45a9244,Merge_failed,335c20152b35b06a9edcea0c8631f6b1c11e35229d6afba37a34cda11649a215,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,0.05094456672668457,0.05145668983459473,0.062398672103881836,0.07542252540588379,0.06225466728210449,0.0626833438873291,0.06206226348876953,0.16838884353637695,0.32964301109313965,1.5538756847381592,0.310117244720459,0.12971258163452148,0.19046807289123535,0.1388387680053711,0.1805262565612793,0.1837172508239746 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,True,10,21,100,6,True,10,Tests_passed,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,True,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,True,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,4a99ebc6e6d72fc46608dc9b97e88820f08df5c89113ac4f6330e78a5a3ab031,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,2e3d2c1da99c8494d37fb6bc3ca6569504218be7539e432a5ee904213f1819a2,Merge_failed,aa1fe8cdfd0cd3ebdd8a68e6e36430a41454bf342db581790b70f3fac45a9244,Merge_failed,335c20152b35b06a9edcea0c8631f6b1c11e35229d6afba37a34cda11649a215,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,Merge_failed,6b52154b6a8a32760335fd9633b86c92af54234195f04c77bd3358437cb6a983,0.05094456672668457,0.05145668983459473,0.062398672103881836,0.07542252540588379,0.06225466728210449,0.0626833438873291,0.06206226348876953,0.16838884353637695,0.32964301109313965,1.5538756847381592,0.310117244720459,0.12971258163452148,0.19046807289123535,0.1388387680053711,0.1805262565612793,0.1837172508239746,0.1787099838256836,0.18293166160583496,0.1884605884552002,0.18230128288269043,0.18326640129089355,0.1893758773803711,0.18834495544433594,0.33269786834716797,0.31592869758605957,1.7194766998291016,0.4394545555114746,0.17460346221923828,0.17605280876159668,0.17759037017822266,0.17671489715576172,0.17262983322143555 diff --git a/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv b/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv index 4a452edda6..f22faba894 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,Tests_passed,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,True,10,44,89.0,2,True,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,True,10,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,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Tests_failed,247c65ac07be30bbdcceb08b503ff2dff45fed1db4c534ad64c246e97b4262eb,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,0ee6550c124569cd913f5a2878fe161bb2d2dfaedaf9d68a12d6eb88feafa3cc,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,f7b69b12a0a1086a8dea47da054f8b5b11807cfaf9bcad5de2019d40920c1410,Tests_failed,d0d52cdbc61bd0d4fe93f6b7d396ba4c6d3fba28ed36dfe10e2216b86d16db44,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,0.021859407424926758,0.010999679565429688,0.021836042404174805,0.031225919723510742,0.02257561683654785,0.010357141494750977,0.02172541618347168,0.055838823318481445,0.0786142349243164,0.7880175113677979,0.4765775203704834,0.0423736572265625,0.05996561050415039,0.058516502380371094,0.043807268142700195,0.056713104248046875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,Tests_passed,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,True,10,44,89.0,2,True,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,True,10,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,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Tests_failed,247c65ac07be30bbdcceb08b503ff2dff45fed1db4c534ad64c246e97b4262eb,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,0ee6550c124569cd913f5a2878fe161bb2d2dfaedaf9d68a12d6eb88feafa3cc,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,f7b69b12a0a1086a8dea47da054f8b5b11807cfaf9bcad5de2019d40920c1410,Tests_failed,d0d52cdbc61bd0d4fe93f6b7d396ba4c6d3fba28ed36dfe10e2216b86d16db44,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,0.021859407424926758,0.010999679565429688,0.021836042404174805,0.031225919723510742,0.02257561683654785,0.010357141494750977,0.02172541618347168,0.055838823318481445,0.0786142349243164,0.7880175113677979,0.4765775203704834,0.0423736572265625,0.05996561050415039,0.058516502380371094,0.043807268142700195,0.056713104248046875,0.05703616142272949,0.042943716049194336,0.05967307090759277,0.042067527770996094,0.058481454849243164,0.057312965393066406,0.06046795845031738,0.08784317970275879,0.07714581489562988,0.7851686477661133,0.5411098003387451,0.05423927307128906,0.05508685111999512,0.0544285774230957,0.054407596588134766,0.04115700721740723 diff --git a/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv b/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv index 1b4ba25f4f..ba91c7aa5f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,Tests_passed,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,True,24,60,471,3,True,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,True,24,True,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,34f8420a1988bf5a2ce07eb5ccc059ae141948afa9bdf469e754dec7fb76d221,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Tests_failed,2358ee24f1292b0cf125ef0b56ec8a93c392ecd55fbcd7d280ea8a49447a53ce,Merge_failed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Merge_failed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,f3869044b6a41755011f329eee55e2af434277ac768353a8c090fd1e4396733b,Tests_failed,489cb9ff2f39ddd54134d7a9d9d822b554e908b538d960afdf4f5d443d9a850d,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,0.01439666748046875,0.015810012817382812,0.015296459197998047,0.028008222579956055,0.014990806579589844,0.015125751495361328,0.015153884887695312,0.056555986404418945,0.12335944175720215,1.5844447612762451,0.43312644958496094,0.052214622497558594,0.09166479110717773,0.05274343490600586,0.0892171859741211,0.09584832191467285 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,Tests_passed,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,True,24,60,471,3,True,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,True,24,True,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,34f8420a1988bf5a2ce07eb5ccc059ae141948afa9bdf469e754dec7fb76d221,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Tests_failed,2358ee24f1292b0cf125ef0b56ec8a93c392ecd55fbcd7d280ea8a49447a53ce,Merge_failed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Merge_failed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,f3869044b6a41755011f329eee55e2af434277ac768353a8c090fd1e4396733b,Tests_failed,489cb9ff2f39ddd54134d7a9d9d822b554e908b538d960afdf4f5d443d9a850d,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,5112b4f50220a0f3670f5ef450ee46c9d307f3fc087c45859ce98e74145f22ef,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,0.01439666748046875,0.015810012817382812,0.015296459197998047,0.028008222579956055,0.014990806579589844,0.015125751495361328,0.015153884887695312,0.056555986404418945,0.12335944175720215,1.5844447612762451,0.43312644958496094,0.052214622497558594,0.09166479110717773,0.05274343490600586,0.0892171859741211,0.09584832191467285,0.0871121883392334,0.08963990211486816,0.09004974365234375,0.09257912635803223,0.08858084678649902,0.09178042411804199,0.08934640884399414,0.13415980339050293,0.14996957778930664,1.7633352279663086,0.5470380783081055,0.08358097076416016,0.08746767044067383,0.08934307098388672,0.0896458625793457,0.09023213386535645 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 9cdc6e6399..6adae12b46 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,Tests_passed,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,True,3.0,7,57.0,2,True,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,True,3,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,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,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,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,ecd37cb45e08ee622dfdea1ae0f0675e1e0da58564571f38bb5f4ce19fe9ca24,Tests_failed,22b55ee655c1a18adaca4d231478ce675defaa8a6e146f23b1113765c0a788bf,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,0.010823965072631836,0.010698318481445312,0.01191258430480957,0.018894195556640625,0.011278390884399414,0.01170969009399414,0.0119476318359375,0.0362851619720459,0.0655522346496582,1.237520456314087,0.43161725997924805,0.035997629165649414,0.06227850914001465,0.03675532341003418,0.06327557563781738,0.06491398811340332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,Tests_passed,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,True,3.0,7,57.0,2,True,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,True,3,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,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,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,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,ecd37cb45e08ee622dfdea1ae0f0675e1e0da58564571f38bb5f4ce19fe9ca24,Tests_failed,22b55ee655c1a18adaca4d231478ce675defaa8a6e146f23b1113765c0a788bf,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,0.010823965072631836,0.010698318481445312,0.01191258430480957,0.018894195556640625,0.011278390884399414,0.01170969009399414,0.0119476318359375,0.0362851619720459,0.0655522346496582,1.237520456314087,0.43161725997924805,0.035997629165649414,0.06227850914001465,0.03675532341003418,0.06327557563781738,0.06491398811340332,0.06057858467102051,0.05824875831604004,0.06428766250610352,0.06276941299438477,0.06282496452331543,0.0618739128112793,0.06382417678833008,0.0962228775024414,0.09204959869384766,1.3195393085479736,0.47968554496765137,0.06175732612609863,0.059455156326293945,0.05785655975341797,0.06000232696533203,0.061090946197509766 diff --git a/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv b/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv index 6e926f863d..0004a066a9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,True,7,73,963,3,True,7,Tests_passed,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,True,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,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,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,954ac1fa13d3f87b4da043fb08deda9e0ce0c3b8c345becd8f5661bf782cb270,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,f4caaefcbf39bc47cf1d0ec4ad73860e311802c0b96a97aa47c674f132444baf,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,0.04359030723571777,0.03660440444946289,0.03833913803100586,0.017788171768188477,0.04389691352844238,0.037693023681640625,0.03993344306945801,0.2400355339050293,0.16442227363586426,0.7402603626251221,1.2135686874389648,0.04807472229003906,0.06588602066040039,0.04641366004943848,0.06532645225524902,0.06559085845947266 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,True,7,73,963,3,True,7,Tests_passed,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,True,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,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,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,954ac1fa13d3f87b4da043fb08deda9e0ce0c3b8c345becd8f5661bf782cb270,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,f4caaefcbf39bc47cf1d0ec4ad73860e311802c0b96a97aa47c674f132444baf,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,0.04359030723571777,0.03660440444946289,0.03833913803100586,0.017788171768188477,0.04389691352844238,0.037693023681640625,0.03993344306945801,0.2400355339050293,0.16442227363586426,0.7402603626251221,1.2135686874389648,0.04807472229003906,0.06588602066040039,0.04641366004943848,0.06532645225524902,0.06559085845947266,0.06474852561950684,0.06508421897888184,0.06527137756347656,0.0711221694946289,0.07129764556884766,0.07335042953491211,0.06490111351013184,0.11759114265441895,0.12681865692138672,0.7515456676483154,1.328625202178955,0.06394600868225098,0.06397104263305664,0.06458926200866699,0.0642540454864502,0.06592822074890137 diff --git a/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv b/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv index a63a209b5a..6aee5265f0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,True,32,50,240.0,2,True,32,Tests_passed,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,True,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,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,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,fe826fec63ea4e17ea5bb150841e1ee5f06939d7b4caf9e27b1b885e53ec5fb7,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,0.01176905632019043,0.01200103759765625,0.012701272964477539,0.01990342140197754,0.012407541275024414,0.01263570785522461,0.013041973114013672,0.03686356544494629,0.06705236434936523,0.5276811122894287,0.29108595848083496,0.036508798599243164,0.06200599670410156,0.03631591796875,0.06231546401977539,0.06270551681518555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,True,32,50,240.0,2,True,32,Tests_passed,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,True,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,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,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,fe826fec63ea4e17ea5bb150841e1ee5f06939d7b4caf9e27b1b885e53ec5fb7,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,Tests_passed,6e9313d62c19314ff15671a2da98b118b1dba632f1d16e3f2f75e621b1ec4486,0.01176905632019043,0.01200103759765625,0.012701272964477539,0.01990342140197754,0.012407541275024414,0.01263570785522461,0.013041973114013672,0.03686356544494629,0.06705236434936523,0.5276811122894287,0.29108595848083496,0.036508798599243164,0.06200599670410156,0.03631591796875,0.06231546401977539,0.06270551681518555,0.060624122619628906,0.06322765350341797,0.06395316123962402,0.06358933448791504,0.0632181167602539,0.06303954124450684,0.06337714195251465,0.09729766845703125,0.0943453311920166,0.7028858661651611,0.31996941566467285,0.06380772590637207,0.06285929679870605,0.06414031982421875,0.06359720230102539,0.06512117385864258 diff --git a/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv b/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv index 5773ba71c8..8326819d22 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,True,True,True,20,23,74,2,True,20,Tests_passed,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,True,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,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,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,df6b47ee455ab0956e76ac78f60daa1881f98b1adda13f2636e81cdf14510638,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,0.046317338943481445,0.03866696357727051,0.05179309844970703,0.020738601684570312,0.04125332832336426,0.04193997383117676,0.04362773895263672,0.045658111572265625,0.12179350852966309,1.2615399360656738,0.4706707000732422,0.03735542297363281,0.06645464897155762,0.03888511657714844,0.06738638877868652,0.07022595405578613 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,True,True,True,20,23,74,2,True,20,Tests_passed,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,True,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,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,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,df6b47ee455ab0956e76ac78f60daa1881f98b1adda13f2636e81cdf14510638,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,98b49bd2dfe9fda3ec02b59772edbc2b8336c62f04eaad2a120563b18ee44826,Tests_passed,ee35cf8cfbd3b166a2a3c3d0736d6757ca458bb5462f9bd0dbedb34e6dec0bf5,0.046317338943481445,0.03866696357727051,0.05179309844970703,0.020738601684570312,0.04125332832336426,0.04193997383117676,0.04362773895263672,0.045658111572265625,0.12179350852966309,1.2615399360656738,0.4706707000732422,0.03735542297363281,0.06645464897155762,0.03888511657714844,0.06738638877868652,0.07022595405578613,0.06521964073181152,0.06318879127502441,0.06482315063476562,0.0676262378692627,0.06697511672973633,0.0684354305267334,0.06580710411071777,0.10077667236328125,0.09637975692749023,1.2453281879425049,0.522254467010498,0.06280946731567383,0.06497311592102051,0.06343746185302734,0.06589341163635254,0.06691360473632812 diff --git a/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv b/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv index fc9aa54ce4..447bd4c503 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,True,28,31,751,3,True,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,True,28,True,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,968c1a920c711ae831b5432a59afb923651c20893966b873a8490546a5696c1c,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Tests_passed,91952eeb51bd58c0bb4803229f4130c48dea1dd56bd61aef157d4ae67f4bbda6,Merge_failed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Tests_passed,a6cfb7c3c1af1e18a96478655b45240b7053892594bae2a31df92b119267509d,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,0.041115522384643555,0.037482500076293945,0.027384519577026367,0.029816865921020508,0.015912294387817383,0.04701805114746094,0.0159909725189209,0.22847580909729004,0.17321085929870605,0.025867938995361328,0.32926464080810547,0.07459282875061035,0.10463309288024902,0.0758516788482666,0.10864710807800293,0.1064462661743164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,True,28,31,751,3,True,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,True,28,True,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,968c1a920c711ae831b5432a59afb923651c20893966b873a8490546a5696c1c,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Tests_passed,91952eeb51bd58c0bb4803229f4130c48dea1dd56bd61aef157d4ae67f4bbda6,Merge_failed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Tests_passed,a6cfb7c3c1af1e18a96478655b45240b7053892594bae2a31df92b119267509d,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,0.041115522384643555,0.037482500076293945,0.027384519577026367,0.029816865921020508,0.015912294387817383,0.04701805114746094,0.0159909725189209,0.22847580909729004,0.17321085929870605,0.025867938995361328,0.32926464080810547,0.07459282875061035,0.10463309288024902,0.0758516788482666,0.10864710807800293,0.1064462661743164,0.10386037826538086,0.10300469398498535,0.10706090927124023,0.11115336418151855,0.08812355995178223,0.09303641319274902,0.10512590408325195,0.1535651683807373,0.14035367965698242,1.1454377174377441,0.4292182922363281,0.10624575614929199,0.10127496719360352,0.08429789543151855,0.09649324417114258,0.10597681999206543 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 a59a0ca490..30b64a260f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,True,True,True,12,21,356,2,True,12,Tests_passed,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,True,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,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_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,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_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,b9016b41f10f3dcff4499078a1161b354527897604ee55d51ab67700f73fb30b,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,0.011737346649169922,0.012323856353759766,0.013914108276367188,0.01997089385986328,0.013606071472167969,0.01330709457397461,0.013443946838378906,0.0396425724029541,0.06792807579040527,1.1510636806488037,0.5863077640533447,0.04001641273498535,0.06666350364685059,0.03797125816345215,0.06603407859802246,0.0652761459350586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,True,True,True,12,21,356,2,True,12,Tests_passed,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,True,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,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_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,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_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,b9016b41f10f3dcff4499078a1161b354527897604ee55d51ab67700f73fb30b,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,0.011737346649169922,0.012323856353759766,0.013914108276367188,0.01997089385986328,0.013606071472167969,0.01330709457397461,0.013443946838378906,0.0396425724029541,0.06792807579040527,1.1510636806488037,0.5863077640533447,0.04001641273498535,0.06666350364685059,0.03797125816345215,0.06603407859802246,0.0652761459350586,0.0624239444732666,0.0630490779876709,0.06243395805358887,0.06534504890441895,0.06400227546691895,0.06533050537109375,0.06847190856933594,0.10316634178161621,0.09145045280456543,1.259737491607666,0.6231584548950195,0.06363677978515625,0.06340718269348145,0.06323051452636719,0.06369709968566895,0.06314563751220703 diff --git a/results/combined/merges_timed/jexp/jpatterns.csv b/results/combined/merges_timed/jexp/jpatterns.csv index 0a0f031211..798f0b89a2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,True,True,Tests_passed,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,True,63,66,8849,6,True,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,True,104,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,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,bc823af7f2ff68d455c105255dff5f32c377396e6a8f88487162b76c18a867ed,Merge_failed,fab8e24d618d89b98e9c0adf72cc5060cd4fb252a682d89b1fae62403cab48f6,Tests_passed,38eb67f810ddf5855eceb48be5f7018e733c51d59167922906ce7c19da29526b,Merge_timedout,,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,0.07150006294250488,0.059450387954711914,0.06499052047729492,0.03086400032043457,0.05617046356201172,0.06578302383422852,0.06175041198730469,1.9265525341033936,2.6424057483673096,21.234198808670044,-1.0,0.280198335647583,0.14705824851989746,0.2824976444244385,0.14682269096374512,0.14268136024475098 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,True,True,Tests_passed,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,True,63,66,8849,6,True,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,True,104,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,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,bc823af7f2ff68d455c105255dff5f32c377396e6a8f88487162b76c18a867ed,Merge_failed,fab8e24d618d89b98e9c0adf72cc5060cd4fb252a682d89b1fae62403cab48f6,Tests_passed,38eb67f810ddf5855eceb48be5f7018e733c51d59167922906ce7c19da29526b,Merge_timedout,,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Merge_failed,cf660e356b169ad394325343525c0df37753c363c16c7bc096939253030ba9f1,Tests_passed,5d4d8fc644f2fd3ec2c7b757741e496f516f779d580d2d7783ced0f22181d84d,0.07150006294250488,0.059450387954711914,0.06499052047729492,0.03086400032043457,0.05617046356201172,0.06578302383422852,0.06175041198730469,1.9265525341033936,2.6424057483673096,21.234198808670044,-1.0,0.280198335647583,0.14705824851989746,0.2824976444244385,0.14682269096374512,0.14268136024475098,0.1354820728302002,0.14036798477172852,0.138092041015625,0.14873003959655762,0.133575439453125,0.13565397262573242,0.13599228858947754,0.6079142093658447,1.245671272277832,21.48228693008423,-1.0,0.1370384693145752,0.13686537742614746,0.13452577590942383,0.13461780548095703,0.14246416091918945 diff --git a/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv b/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv index b8534d0207..e957a41923 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,True,True,Tests_passed,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,True,19,20,982,2,True,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,True,19,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,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,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,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_failed,562c8cdef8ed84b15a13d456f67a2a71f14834197ad3612efda4b65589656b79,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,0.013459205627441406,0.01370859146118164,0.016000986099243164,0.023662567138671875,0.015899658203125,0.0160677433013916,0.01641559600830078,0.04207181930541992,0.0690617561340332,0.4411039352416992,0.38605499267578125,0.04105067253112793,0.06503748893737793,0.04207587242126465,0.06582021713256836,0.06548619270324707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,True,True,Tests_passed,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,True,19,20,982,2,True,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,True,19,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,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,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,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_failed,562c8cdef8ed84b15a13d456f67a2a71f14834197ad3612efda4b65589656b79,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,0.013459205627441406,0.01370859146118164,0.016000986099243164,0.023662567138671875,0.015899658203125,0.0160677433013916,0.01641559600830078,0.04207181930541992,0.0690617561340332,0.4411039352416992,0.38605499267578125,0.04105067253112793,0.06503748893737793,0.04207587242126465,0.06582021713256836,0.06548619270324707,0.06459522247314453,0.06436848640441895,0.06828832626342773,0.06786274909973145,0.06851649284362793,0.0676569938659668,0.06537652015686035,0.10292673110961914,0.09625554084777832,0.5039839744567871,0.4351949691772461,0.0658116340637207,0.06408238410949707,0.06648898124694824,0.06528639793395996,0.06419992446899414 diff --git a/results/combined/merges_timed/jfaster/mango.csv b/results/combined/merges_timed/jfaster/mango.csv index bdc6e4fd8a..5d6d9cd5e0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,True,138,471,5334,3,True,138,Tests_passed,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,True,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,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,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,7f4988033d1b22c98f905af2b3ad43ff87fab2f3d8663666098a4ebb55515dc8,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,fbbb592b68c5568d94061cc7004f7c25ee513e0a3d9e9e6b84476aad55210abb,Tests_failed,09a39f6f85f7b6d608d51f24d1e6e1edfcb060b7066f8739d585d64e122ef589,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,0.06231975555419922,0.05386066436767578,0.04415321350097656,0.027770519256591797,0.05516314506530762,0.05315041542053223,0.0686805248260498,0.1176762580871582,0.17880630493164062,1.3427941799163818,1.5766997337341309,0.05775260925292969,0.07995772361755371,0.057647705078125,0.08149170875549316,0.0814523696899414 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,True,138,471,5334,3,True,138,Tests_passed,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,True,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,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,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,7f4988033d1b22c98f905af2b3ad43ff87fab2f3d8663666098a4ebb55515dc8,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,fbbb592b68c5568d94061cc7004f7c25ee513e0a3d9e9e6b84476aad55210abb,Tests_failed,09a39f6f85f7b6d608d51f24d1e6e1edfcb060b7066f8739d585d64e122ef589,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,0.06231975555419922,0.05386066436767578,0.04415321350097656,0.027770519256591797,0.05516314506530762,0.05315041542053223,0.0686805248260498,0.1176762580871582,0.17880630493164062,1.3427941799163818,1.5766997337341309,0.05775260925292969,0.07995772361755371,0.057647705078125,0.08149170875549316,0.0814523696899414,0.08067750930786133,0.07909893989562988,0.08358097076416016,0.08127450942993164,0.0820760726928711,0.07984304428100586,0.08264970779418945,0.13359451293945312,0.14260625839233398,1.4450864791870117,1.9045231342315674,0.08156943321228027,0.08140063285827637,0.08107447624206543,0.07978177070617676,0.08021044731140137 diff --git a/results/combined/merges_timed/jfinal/jfinal.csv b/results/combined/merges_timed/jfinal/jfinal.csv index 105b8ffd76..2ac828e631 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,True,150,488,6664,3,True,154,Tests_passed,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,True,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,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,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_failed,d81b04d32a20fc098ed5153dcb9939ddd21b5f5aabdc138cec87707c46c3dd21,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,61d45637250a521d521f51f81291b975bd9dcf515239c67c351b4b53e53ddd00,Tests_failed,d81b04d32a20fc098ed5153dcb9939ddd21b5f5aabdc138cec87707c46c3dd21,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.033329010009765625,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.13912129402160645,0.7708566188812256,1.8648455142974854,0.06293272972106934,0.1086275577545166,0.07053542137145996,0.10681748390197754,0.10937905311584473 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,True,150,488,6664,3,True,154,Tests_passed,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,True,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,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,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_failed,d81b04d32a20fc098ed5153dcb9939ddd21b5f5aabdc138cec87707c46c3dd21,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,61d45637250a521d521f51f81291b975bd9dcf515239c67c351b4b53e53ddd00,Tests_failed,d81b04d32a20fc098ed5153dcb9939ddd21b5f5aabdc138cec87707c46c3dd21,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,Tests_passed,624891ec3fe4250b654806db6a45b9369bd346f87e03327620c9e8538f74d3c1,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.033329010009765625,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.13912129402160645,0.7708566188812256,1.8648455142974854,0.06293272972106934,0.1086275577545166,0.07053542137145996,0.10681748390197754,0.10937905311584473,0.10331201553344727,0.10561990737915039,0.12249183654785156,0.11638927459716797,0.10484123229980469,0.10515546798706055,0.12641596794128418,0.16263771057128906,0.16042065620422363,0.8823964595794678,1.8932521343231201,0.10365414619445801,0.10445094108581543,0.1224977970123291,0.10506391525268555,0.10275745391845703 diff --git a/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv b/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv index e8236352e9..8f9af39b41 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,True,61,358,1651,6,True,61,Tests_passed,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,True,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,True,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,9397b0c41f68b6d50f5c3b55d00052dc39744dc800968c126b72ac0d55994f48,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,Merge_failed,4b9f3e6fb2af3719b32c745a587d019d1241633bb834ce42a84471101886bd8e,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,466d9431d1b87845730ff1890c4efa66d20d25bca94998d24be8e7c0fa48891e,Merge_failed,466d9431d1b87845730ff1890c4efa66d20d25bca94998d24be8e7c0fa48891e,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,f1d1a083ef28be9f2cb8d408b5f32d5c61c8ff6b19f070ec7cf583d23cba17db,Merge_failed,b398beddb06fa141223cb21647fa2bf98ce49c7d0464195a95ff36dfe4c816ea,Merge_failed,ecc36437e3ee2750ef4e83c0f19376ad9291c8cebff3112091f1a726fd75ea4a,Tests_failed,70c0d4130a5ab51e7ea51127a1c82ac43f3590a5a22b735e61e5891cbe8bce66,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,0.017512798309326172,0.017928361892700195,0.019116640090942383,0.029056787490844727,0.018294572830200195,0.018285036087036133,0.018404006958007812,0.09440159797668457,0.29701733589172363,3.993100166320801,1.9504830837249756,0.09438943862915039,0.12218046188354492,0.09376311302185059,0.13022661209106445,0.12276959419250488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,True,61,358,1651,6,True,61,Tests_passed,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,True,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,True,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,9397b0c41f68b6d50f5c3b55d00052dc39744dc800968c126b72ac0d55994f48,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,Merge_failed,4b9f3e6fb2af3719b32c745a587d019d1241633bb834ce42a84471101886bd8e,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,Merge_failed,466d9431d1b87845730ff1890c4efa66d20d25bca94998d24be8e7c0fa48891e,Merge_failed,466d9431d1b87845730ff1890c4efa66d20d25bca94998d24be8e7c0fa48891e,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,f1d1a083ef28be9f2cb8d408b5f32d5c61c8ff6b19f070ec7cf583d23cba17db,Merge_failed,b398beddb06fa141223cb21647fa2bf98ce49c7d0464195a95ff36dfe4c816ea,Merge_failed,ecc36437e3ee2750ef4e83c0f19376ad9291c8cebff3112091f1a726fd75ea4a,Tests_failed,70c0d4130a5ab51e7ea51127a1c82ac43f3590a5a22b735e61e5891cbe8bce66,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,84d6998cbd77b67338b9e37f10fc8e4619cbbd4a0dd5bb80505e827afd931fd9,Merge_failed,25b5a642dea48eb3d111e094da6442c77c270fa6b600de7b8df8b1031a082dde,0.017512798309326172,0.017928361892700195,0.019116640090942383,0.029056787490844727,0.018294572830200195,0.018285036087036133,0.018404006958007812,0.09440159797668457,0.29701733589172363,3.993100166320801,1.9504830837249756,0.09438943862915039,0.12218046188354492,0.09376311302185059,0.13022661209106445,0.12276959419250488,0.1242361068725586,0.12395548820495605,0.12471795082092285,0.11873173713684082,0.1244502067565918,0.12105941772460938,0.12589073181152344,0.2214069366455078,0.26593542098999023,4.233333349227905,2.0849008560180664,0.12562084197998047,0.12040209770202637,0.12030649185180664,0.12316679954528809,0.12021446228027344 diff --git a/results/combined/merges_timed/jgralab/jgralab.csv b/results/combined/merges_timed/jgralab/jgralab.csv index 0be4287f47..2b079b7907 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -374,refs/remotes/origin/disk-store,fbd9a0ffd885f02b80fbd72715848d2f0d5c0bc9,e1661886641270fc867fc80e971ccb21bdda20e8,0282b628a97a63728ab36d1837234aa998fbe6f2,,True,True,True,47,354,3563.0,41,True,82,Tests_passed,4e94f6f784c015b60f537cd47d3ff5b6d1794d110ad63a73f030b32ade165c5e,True,Tests_passed,85847ada20a0be7cf15901e6c180538d8accdff44402fb808c74cc2d360f8adb,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,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Merge_failed,84b75e344597fa7f169236972378447367945f3ed6d6963fb6b8a0742a818c0c,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,d0b122c7036af3695f224e2eb416aa56208a9964384f426062cb31aaeed1b660,Tests_passed,51e745bc27363ebe42fed66ad4957b002b4c3d3c928ea7768ecbd13ef9e3367f,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,0.019261598587036133,0.019805192947387695,0.023595571517944336,0.03106975555419922,0.023405075073242188,0.023762226104736328,0.02151632308959961,0.11314225196838379,0.293903112411499,5.831105470657349,2.0081536769866943,0.055298805236816406,0.18322205543518066,0.05618405342102051,0.1805574893951416,0.1803901195526123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +374,refs/remotes/origin/disk-store,fbd9a0ffd885f02b80fbd72715848d2f0d5c0bc9,e1661886641270fc867fc80e971ccb21bdda20e8,0282b628a97a63728ab36d1837234aa998fbe6f2,,True,True,True,47,354,3563.0,41,True,82,Tests_passed,4e94f6f784c015b60f537cd47d3ff5b6d1794d110ad63a73f030b32ade165c5e,True,Tests_passed,85847ada20a0be7cf15901e6c180538d8accdff44402fb808c74cc2d360f8adb,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,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Merge_failed,84b75e344597fa7f169236972378447367945f3ed6d6963fb6b8a0742a818c0c,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,d0b122c7036af3695f224e2eb416aa56208a9964384f426062cb31aaeed1b660,Tests_passed,51e745bc27363ebe42fed66ad4957b002b4c3d3c928ea7768ecbd13ef9e3367f,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,Tests_passed,bf6d496d2eeb439e43d7c32eb5783280392b31f77608ea2ed055524bcfcda09b,0.019261598587036133,0.019805192947387695,0.023595571517944336,0.03106975555419922,0.023405075073242188,0.023762226104736328,0.02151632308959961,0.11314225196838379,0.293903112411499,5.831105470657349,2.0081536769866943,0.055298805236816406,0.18322205543518066,0.05618405342102051,0.1805574893951416,0.1803901195526123,0.1718442440032959,0.17174625396728516,0.17935466766357422,0.17840075492858887,0.1748197078704834,0.17408370971679688,0.15326476097106934,0.28678464889526367,0.31080079078674316,5.620968818664551,2.0389294624328613,0.17168283462524414,0.17148375511169434,0.17003393173217773,0.16977429389953613,0.17209362983703613 diff --git a/results/combined/merges_timed/jgrapht/jgrapht.csv b/results/combined/merges_timed/jgrapht/jgrapht.csv index b0c70a146f..3744e48666 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,True,True,Tests_passed,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,True,534,3910,18401.0,8,True,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,True,534,True,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,ade1058762dcc162cb0056f43b57e2e43fc45daccadc9d7b2e8c57987ed0b4ac,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_timedout,,Merge_failed,77ea59d62a687b92ff760df1d355a2e3d62b25e889549f274ae0f9ec72aaaf8f,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,23c0439e007d62af8095415084bdd206efd138cf7b5a39f6e8e94a909a97450b,Merge_failed,a4cd93d1032d8fffc665e3049be138f764e632ee6026a17eeee1c60b35a4a9fc,Merge_failed,8a2a1a0263cc1bc657fc326508de95afa510bb2a25cd116f333acb96c529c296,Merge_timedout,,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.10236001014709473,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.5247592926025391,4.734174489974976,-1.0,0.20068669319152832,0.19098496437072754,0.20323657989501953,0.26667284965515137,0.26049304008483887 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,True,True,Tests_passed,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,True,534,3910,18401.0,8,True,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,True,534,True,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,ade1058762dcc162cb0056f43b57e2e43fc45daccadc9d7b2e8c57987ed0b4ac,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_timedout,,Merge_failed,77ea59d62a687b92ff760df1d355a2e3d62b25e889549f274ae0f9ec72aaaf8f,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,23c0439e007d62af8095415084bdd206efd138cf7b5a39f6e8e94a909a97450b,Merge_failed,a4cd93d1032d8fffc665e3049be138f764e632ee6026a17eeee1c60b35a4a9fc,Merge_failed,8a2a1a0263cc1bc657fc326508de95afa510bb2a25cd116f333acb96c529c296,Merge_timedout,,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,1aebba9ef838a4eb0103a908295ed1a651e89efed0e85d8c45d95b970d2f1efb,Merge_failed,8f7d6e8b766ec5c22532c8e4f971600fd0905c48f9b7fc4a66dfbbb59db247e3,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.10236001014709473,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.5247592926025391,4.734174489974976,-1.0,0.20068669319152832,0.19098496437072754,0.20323657989501953,0.26667284965515137,0.26049304008483887,0.24863719940185547,0.24402070045471191,0.24059414863586426,0.2543172836303711,0.26367664337158203,0.25763964653015137,0.2550208568572998,0.4050774574279785,0.4584329128265381,4.77066969871521,-1.0,0.2408764362335205,0.2505931854248047,0.24631237983703613,0.25518250465393066,0.25019097328186035 diff --git a/results/combined/merges_timed/jhalterman/concurrentunit.csv b/results/combined/merges_timed/jhalterman/concurrentunit.csv index 965184d9d9..3b6aebbc77 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,Tests_passed,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,True,8,7,1331,6,True,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,True,8,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a9b2bbf592873f2b51fe2c17935db032dfd79f9aa7f24687094a0493847fe0e,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,868bc6d42bef9a822bf6535bd06e304a408f541db0b176b3f8f3f7829c9ba27b,Merge_failed,81e0ff709d6ec13b4a897653633932addde57dcf6385cd4b52ba944b6ddce022,Merge_failed,1afbd4459a53fb345688f9428a12e3d3a1c00f36d28f1e38fe250bc6e0722d3a,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,0.036554813385009766,0.04093503952026367,0.010076522827148438,0.012777328491210938,0.009896039962768555,0.04133415222167969,0.024639129638671875,0.40541863441467285,0.3318352699279785,1.6225087642669678,0.3725278377532959,0.10883712768554688,0.08855867385864258,0.17667007446289062,0.22236990928649902,0.09671378135681152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,Tests_passed,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,True,8,7,1331,6,True,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,True,8,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a9b2bbf592873f2b51fe2c17935db032dfd79f9aa7f24687094a0493847fe0e,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,868bc6d42bef9a822bf6535bd06e304a408f541db0b176b3f8f3f7829c9ba27b,Merge_failed,81e0ff709d6ec13b4a897653633932addde57dcf6385cd4b52ba944b6ddce022,Merge_failed,1afbd4459a53fb345688f9428a12e3d3a1c00f36d28f1e38fe250bc6e0722d3a,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,7a64a93a5b0f12977e37920ce1aea392043d3e0b45dced1bf856f16ac86a73e4,Merge_failed,d861bbac31226fb702159668b1b77720ce88c9404994fafc4508fd43af97b4b3,0.036554813385009766,0.04093503952026367,0.010076522827148438,0.012777328491210938,0.009896039962768555,0.04133415222167969,0.024639129638671875,0.40541863441467285,0.3318352699279785,1.6225087642669678,0.3725278377532959,0.10883712768554688,0.08855867385864258,0.17667007446289062,0.22236990928649902,0.09671378135681152,0.21869802474975586,0.09030342102050781,0.21838784217834473,0.09327864646911621,0.22078633308410645,0.2195417881011963,0.219818115234375,0.30997562408447266,0.35379815101623535,1.6808202266693115,0.5834691524505615,0.21939945220947266,0.21876764297485352,0.21639466285705566,0.21905016899108887,0.09077262878417969 diff --git a/results/combined/merges_timed/jhalterman/expiringmap.csv b/results/combined/merges_timed/jhalterman/expiringmap.csv index f018921881..9da1d95a0b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,True,9,23,212,2,True,9,Tests_passed,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,True,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,True,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,328f7ff681f29f55824e86fbeb1c3ab468da0dcff7829b65eafd4165b56a8d54,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_timedout,,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,da4c3cdaef8a2ca1f068742be6d312e5e5311db51083ee29056d386d4caae53c,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,c5db88943d2ae3373ccfd5dcc21ac92ca6ab42a1499ab2020645ae31550a2c57,Merge_timedout,,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,0.0465540885925293,0.04394102096557617,0.04411005973815918,0.014740705490112305,0.0460050106048584,0.04077935218811035,0.0419464111328125,0.17460870742797852,0.12178659439086914,1.8704066276550293,-1.0,0.04232597351074219,0.043537139892578125,0.042600154876708984,0.0441739559173584,0.043493032455444336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,True,9,23,212,2,True,9,Tests_passed,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,True,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,True,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,328f7ff681f29f55824e86fbeb1c3ab468da0dcff7829b65eafd4165b56a8d54,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_timedout,,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,da4c3cdaef8a2ca1f068742be6d312e5e5311db51083ee29056d386d4caae53c,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,c5db88943d2ae3373ccfd5dcc21ac92ca6ab42a1499ab2020645ae31550a2c57,Merge_timedout,,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,0.0465540885925293,0.04394102096557617,0.04411005973815918,0.014740705490112305,0.0460050106048584,0.04077935218811035,0.0419464111328125,0.17460870742797852,0.12178659439086914,1.8704066276550293,-1.0,0.04232597351074219,0.043537139892578125,0.042600154876708984,0.0441739559173584,0.043493032455444336,0.042542219161987305,0.0437929630279541,0.0429987907409668,0.04255056381225586,0.04180145263671875,0.04273176193237305,0.043183088302612305,0.0741884708404541,0.07609772682189941,1.8336803913116455,-1.0,0.044228315353393555,0.04151177406311035,0.04201388359069824,0.04387664794921875,0.04346823692321777 diff --git a/results/combined/merges_timed/jhalterman/failsafe.csv b/results/combined/merges_timed/jhalterman/failsafe.csv index 83034e9dac..83b595c3f9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,True,7,11,109,3,True,7,Tests_passed,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,True,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,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,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,a27a7161fee39e53cbe26719927d9065e57fa1ea724c9eb632e032eebd9ce5bf,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.01588916778564453,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.1583564281463623,0.656266450881958,0.42878198623657227,0.03173398971557617,0.07560181617736816,0.031696319580078125,0.07674050331115723,0.07672429084777832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,True,7,11,109,3,True,7,Tests_passed,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,True,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,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,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,a27a7161fee39e53cbe26719927d9065e57fa1ea724c9eb632e032eebd9ce5bf,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,Tests_passed,3eee4d26e1f2fcfdb05a622d8c8518e6eee1176ee9ef8672ace79f1f43665279,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.01588916778564453,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.1583564281463623,0.656266450881958,0.42878198623657227,0.03173398971557617,0.07560181617736816,0.031696319580078125,0.07674050331115723,0.07672429084777832,0.07114481925964355,0.0728752613067627,0.0720221996307373,0.07137107849121094,0.07143807411193848,0.07284855842590332,0.07328057289123535,0.12325811386108398,0.12594008445739746,0.6804165840148926,0.4617142677307129,0.07378482818603516,0.07210755348205566,0.07190275192260742,0.07125639915466309,0.07188200950622559 diff --git a/results/combined/merges_timed/jiaqi/jmxterm.csv b/results/combined/merges_timed/jiaqi/jmxterm.csv index 404f48e6e3..e47756e6c5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,True,3,6,12,18,True,18,Tests_passed,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,True,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,True,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,794ddcf62288d3dbea5548ae8d5986cf49fd68044fe635ddb14d5648c92185d4,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,f1d060ceaafb2700a3c105e250dab00bb2d2b63c14cbbd37e3fb46bbbb08777b,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,0.039209842681884766,0.05180096626281738,0.04096364974975586,0.01959371566772461,0.0431060791015625,0.03855276107788086,0.04003620147705078,0.21147823333740234,0.16685247421264648,0.7971315383911133,0.38584399223327637,0.04256153106689453,0.06639862060546875,0.04653120040893555,0.0803232192993164,0.08125185966491699 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,True,3,6,12,18,True,18,Tests_passed,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,True,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,True,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,794ddcf62288d3dbea5548ae8d5986cf49fd68044fe635ddb14d5648c92185d4,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,f1d060ceaafb2700a3c105e250dab00bb2d2b63c14cbbd37e3fb46bbbb08777b,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,e1e102cedb696303823b9bfd89db9de80c5dd2d595960c16f255e2fd093e28b2,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,0.039209842681884766,0.05180096626281738,0.04096364974975586,0.01959371566772461,0.0431060791015625,0.03855276107788086,0.04003620147705078,0.21147823333740234,0.16685247421264648,0.7971315383911133,0.38584399223327637,0.04256153106689453,0.06639862060546875,0.04653120040893555,0.0803232192993164,0.08125185966491699,0.07950878143310547,0.08334660530090332,0.07042670249938965,0.0830984115600586,0.07883572578430176,0.07631111145019531,0.08324265480041504,0.12737441062927246,0.1321277618408203,0.8713517189025879,0.4709041118621826,0.0780954360961914,0.07763934135437012,0.08010745048522949,0.08183693885803223,0.0803823471069336 diff --git a/results/combined/merges_timed/jinahya/bit-io.csv b/results/combined/merges_timed/jinahya/bit-io.csv index 916ec38e77..02b367387b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,True,True,True,11,46,256,18,True,26,Tests_passed,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,True,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,True,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,724214221e0e4ce23bdc5c8575d34c4c68762b0c40f463ae21e04bd46b2cb90a,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,45d9b819d4705b45cb45b2121b90ef16c77e03062301a39adfb7ae47b22413fa,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,0.008577346801757812,0.008734941482543945,0.008577585220336914,0.014133930206298828,0.008471488952636719,0.008391380310058594,0.008445024490356445,0.08540940284729004,0.12073898315429688,0.5287883281707764,0.5459766387939453,0.04814720153808594,0.06212878227233887,0.04804182052612305,0.07292723655700684,0.0741274356842041 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,True,True,True,11,46,256,18,True,26,Tests_passed,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,True,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,True,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,724214221e0e4ce23bdc5c8575d34c4c68762b0c40f463ae21e04bd46b2cb90a,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,45d9b819d4705b45cb45b2121b90ef16c77e03062301a39adfb7ae47b22413fa,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,0.008577346801757812,0.008734941482543945,0.008577585220336914,0.014133930206298828,0.008471488952636719,0.008391380310058594,0.008445024490356445,0.08540940284729004,0.12073898315429688,0.5287883281707764,0.5459766387939453,0.04814720153808594,0.06212878227233887,0.04804182052612305,0.07292723655700684,0.0741274356842041,0.0719459056854248,0.07033753395080566,0.0710599422454834,0.0694890022277832,0.07002091407775879,0.07005882263183594,0.06922340393066406,0.1177210807800293,0.1326608657836914,0.5981335639953613,0.6124787330627441,0.07172703742980957,0.06882166862487793,0.07128596305847168,0.0699920654296875,0.06997871398925781 diff --git a/results/combined/merges_timed/jingwei/krati.csv b/results/combined/merges_timed/jingwei/krati.csv index 41bb584f2f..f349bc0c81 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,True,19,70,389,2,True,19,Tests_passed,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,True,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,True,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,6284918bb801520170ef7cbf3b857932dbe0c41066d4c06070548164ea5e7492,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Tests_failed,b0334dbf1fda9a5098ad4fcc266b6acb8999a037444f663114500cb175737132,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,2dc7ec0b2fd88714efbb0df109e3e78d6827e83fe351a400e6043dd01baa6b62,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,281ccbe6cf97cee0456f72f5ef30082bb6300f0a177d5bf6f1d3a34caa14678b,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Tests_passed,95aaa933a38c2ca79661e2ef68f3978bc5f2f0ce4ccce1e2e1b108bbeda40d82,Tests_failed,195a47fa1fc9a5f2f09b10024c4d84f6390a370c4c7a6ecae8dca08bb1618983,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,0.028177261352539062,0.010645389556884766,0.032659292221069336,0.016931772232055664,0.03278040885925293,0.02961421012878418,0.0332338809967041,0.07159614562988281,0.06957435607910156,0.5070490837097168,0.5608255863189697,0.043720245361328125,0.046784400939941406,0.04379701614379883,0.04857373237609863,0.049883127212524414 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,True,19,70,389,2,True,19,Tests_passed,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,True,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,True,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,6284918bb801520170ef7cbf3b857932dbe0c41066d4c06070548164ea5e7492,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Tests_failed,b0334dbf1fda9a5098ad4fcc266b6acb8999a037444f663114500cb175737132,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,2dc7ec0b2fd88714efbb0df109e3e78d6827e83fe351a400e6043dd01baa6b62,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,281ccbe6cf97cee0456f72f5ef30082bb6300f0a177d5bf6f1d3a34caa14678b,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Tests_passed,95aaa933a38c2ca79661e2ef68f3978bc5f2f0ce4ccce1e2e1b108bbeda40d82,Tests_failed,195a47fa1fc9a5f2f09b10024c4d84f6390a370c4c7a6ecae8dca08bb1618983,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,ea0b882dfde6e43986615df4f50c8e16c365ae74e05d74bf484b610ce342ab8b,0.028177261352539062,0.010645389556884766,0.032659292221069336,0.016931772232055664,0.03278040885925293,0.02961421012878418,0.0332338809967041,0.07159614562988281,0.06957435607910156,0.5070490837097168,0.5608255863189697,0.043720245361328125,0.046784400939941406,0.04379701614379883,0.04857373237609863,0.049883127212524414,0.048320770263671875,0.04735827445983887,0.04736948013305664,0.04732871055603027,0.04644060134887695,0.04521918296813965,0.0464482307434082,0.12729811668395996,0.08253931999206543,0.57318115234375,0.6216964721679688,0.045389652252197266,0.0461125373840332,0.04611015319824219,0.04721260070800781,0.04760003089904785 diff --git a/results/combined/merges_timed/jitsi/dnssecjava.csv b/results/combined/merges_timed/jitsi/dnssecjava.csv index 86731a70ca..d80b3fe83c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,True,True,Tests_passed,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,True,152,348,2197,6,True,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,True,152,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_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,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_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,b297d31721648b4333bbdd9864656d837d564518f62bc5bbdb46e64f2c2ad293,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,0.07851672172546387,0.07200288772583008,0.06151771545410156,0.05500650405883789,0.045073509216308594,0.05920863151550293,0.07761311531066895,0.49457454681396484,0.3729708194732666,4.702235698699951,0.7967817783355713,0.06367659568786621,0.18927907943725586,0.0908203125,0.18842434883117676,0.18946623802185059 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,True,True,Tests_passed,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,True,152,348,2197,6,True,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,True,152,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_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,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_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,b297d31721648b4333bbdd9864656d837d564518f62bc5bbdb46e64f2c2ad293,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,0.07851672172546387,0.07200288772583008,0.06151771545410156,0.05500650405883789,0.045073509216308594,0.05920863151550293,0.07761311531066895,0.49457454681396484,0.3729708194732666,4.702235698699951,0.7967817783355713,0.06367659568786621,0.18927907943725586,0.0908203125,0.18842434883117676,0.18946623802185059,0.18216919898986816,0.19539570808410645,0.1831367015838623,0.19170928001403809,0.18004131317138672,0.18100380897521973,0.1925506591796875,0.3149075508117676,0.3081634044647217,4.805504560470581,0.8291933536529541,0.17800545692443848,0.1795027256011963,0.17478656768798828,0.17923235893249512,0.18083786964416504 diff --git a/results/combined/merges_timed/jkotlinski/lsdpatch.csv b/results/combined/merges_timed/jkotlinski/lsdpatch.csv index 3a2cdae41e..9bd60fb6a6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,True,False,Tests_passed,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,True,2,13,33,2,True,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,True,2,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,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,c528b29427a6501ba9d472c48c513f7454b18b172c7511a3238729f37d149a60,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,0.034659385681152344,0.02092289924621582,0.036170244216918945,0.027957916259765625,0.036908864974975586,0.02235555648803711,0.026747465133666992,0.18806815147399902,0.12509679794311523,0.04550933837890625,0.4368457794189453,0.058782339096069336,0.056456565856933594,0.05715656280517578,0.05571246147155762,0.05810403823852539 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,True,False,Tests_passed,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,True,2,13,33,2,True,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,True,2,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,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,c528b29427a6501ba9d472c48c513f7454b18b172c7511a3238729f37d149a60,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,0.034659385681152344,0.02092289924621582,0.036170244216918945,0.027957916259765625,0.036908864974975586,0.02235555648803711,0.026747465133666992,0.18806815147399902,0.12509679794311523,0.04550933837890625,0.4368457794189453,0.058782339096069336,0.056456565856933594,0.05715656280517578,0.05571246147155762,0.05810403823852539,0.05551028251647949,0.05482912063598633,0.055220603942871094,0.05777335166931152,0.05664563179016113,0.058409929275512695,0.05849623680114746,0.0927574634552002,0.09849715232849121,0.07122468948364258,0.5347018241882324,0.05428123474121094,0.055069923400878906,0.056279659271240234,0.056087493896484375,0.054888010025024414 diff --git a/results/combined/merges_timed/jline/jline2.csv b/results/combined/merges_timed/jline/jline2.csv index b03361b892..62e38363d7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,89539d94808bd1b79e1e37c099111ba33365812d,ae3a537dcfa86bd9a0588732b7f344b3f3ee7462,4bd5ac04c8303b2225e4bbf4d11a10f50cddd2a3,,True,True,True,16,65,307,3,True,16,Tests_passed,bc94147925eda7622aa08984f41eeeb6b245c558bbbd21f8f8a9be7fcd43058f,True,Tests_passed,1009e9d4366b1fe1aeddf2d15b04cc9dba85c073a7365f863bbb052715018492,True,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_failed,464fea628ff0cf35f81750b4263ecd94e1a3145941c65c005e6f3271fba5babd,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_timedout,5b7b246c9ca418be5a0ce07d55a893569e272c9bd2ae4e09667924ebe4a7b790,,,,,,,,,,,,,0.01579594612121582,0.015341043472290039,0.018152952194213867,0.02120494842529297,0.018912076950073242,0.018461942672729492,0.01755070686340332,0.07026958465576172,0.15241646766662598,1.1427643299102783,0.7470171451568604,0.03902316093444824,0.08195614814758301,0.04042315483093262,0.08315849304199219,0.08125019073486328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,89539d94808bd1b79e1e37c099111ba33365812d,ae3a537dcfa86bd9a0588732b7f344b3f3ee7462,4bd5ac04c8303b2225e4bbf4d11a10f50cddd2a3,,True,True,True,16,65,307,3,True,16,Tests_passed,bc94147925eda7622aa08984f41eeeb6b245c558bbbd21f8f8a9be7fcd43058f,True,Tests_passed,1009e9d4366b1fe1aeddf2d15b04cc9dba85c073a7365f863bbb052715018492,True,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_failed,464fea628ff0cf35f81750b4263ecd94e1a3145941c65c005e6f3271fba5babd,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_timedout,5b7b246c9ca418be5a0ce07d55a893569e272c9bd2ae4e09667924ebe4a7b790,,,,,,,,,,,,,0.01579594612121582,0.015341043472290039,0.018152952194213867,0.02120494842529297,0.018912076950073242,0.018461942672729492,0.01755070686340332,0.07026958465576172,0.15241646766662598,1.1427643299102783,0.7470171451568604,0.03902316093444824,0.08195614814758301,0.04042315483093262,0.08315849304199219,0.08125019073486328,0.08161187171936035,0.0774378776550293,0.07895922660827637,0.07894396781921387,0.0799705982208252,0.08209609985351562,0.08102893829345703,0.1310577392578125,0.13485074043273926,1.2047874927520752,0.8125202655792236,0.08246135711669922,0.07715034484863281,0.07779097557067871,0.07980608940124512,0.07843613624572754 diff --git a/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv b/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv index a8a0dbc7ff..5f068df957 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,True,True,Tests_passed,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,True,10,21,258,2,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,True,10,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,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,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,1edac41e101a6e1019c16351f13b93024ba07e56f9880889fe869225bbc18ed8,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,0.04502224922180176,0.05085611343383789,0.052910566329956055,0.020632505416870117,0.05642390251159668,0.014815330505371094,0.06270527839660645,0.17273974418640137,0.13174843788146973,1.3170785903930664,0.6235964298248291,0.038724660873413086,0.07023096084594727,0.038015127182006836,0.06739068031311035,0.06938576698303223 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,True,True,Tests_passed,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,True,10,21,258,2,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,True,10,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,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,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,1edac41e101a6e1019c16351f13b93024ba07e56f9880889fe869225bbc18ed8,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,0.04502224922180176,0.05085611343383789,0.052910566329956055,0.020632505416870117,0.05642390251159668,0.014815330505371094,0.06270527839660645,0.17273974418640137,0.13174843788146973,1.3170785903930664,0.6235964298248291,0.038724660873413086,0.07023096084594727,0.038015127182006836,0.06739068031311035,0.06938576698303223,0.06947112083435059,0.07105875015258789,0.07077169418334961,0.06903505325317383,0.07007527351379395,0.07021379470825195,0.06704330444335938,0.1051945686340332,0.10272383689880371,1.497910976409912,0.7001056671142578,0.0702357292175293,0.06595921516418457,0.06907057762145996,0.06705522537231445,0.06820440292358398 diff --git a/results/combined/merges_timed/jmacglashan/burlap.csv b/results/combined/merges_timed/jmacglashan/burlap.csv index 736fd2048c..83179b550c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,True,True,True,46,65,175.0,4,True,46,Tests_passed,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,True,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,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,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,d5036166adc944e32b85ce4fdf6df2124a45b93e6c8b7d7bda17f6054e37d5e9,Tests_failed,6c778550e3655f28e643f1619ada9e11bf586227760f465ce63f9f3d554e1fa0,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,0.05646061897277832,0.04650282859802246,0.022189855575561523,0.027582168579101562,0.04914116859436035,0.06977987289428711,0.06025576591491699,0.3118295669555664,0.2185671329498291,2.793132781982422,1.1658377647399902,0.05105471611022949,0.1203770637512207,0.048485517501831055,0.12009191513061523,0.11815142631530762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,True,True,True,46,65,175.0,4,True,46,Tests_passed,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,True,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,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,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,d5036166adc944e32b85ce4fdf6df2124a45b93e6c8b7d7bda17f6054e37d5e9,Tests_failed,6c778550e3655f28e643f1619ada9e11bf586227760f465ce63f9f3d554e1fa0,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,Tests_passed,b08167960b65e846281bfc359027a020b496e0ac57c8464f82c1b454f3b8475b,0.05646061897277832,0.04650282859802246,0.022189855575561523,0.027582168579101562,0.04914116859436035,0.06977987289428711,0.06025576591491699,0.3118295669555664,0.2185671329498291,2.793132781982422,1.1658377647399902,0.05105471611022949,0.1203770637512207,0.048485517501831055,0.12009191513061523,0.11815142631530762,0.11245155334472656,0.11949706077575684,0.1140587329864502,0.1176445484161377,0.11736726760864258,0.11569595336914062,0.1175222396850586,0.1858060359954834,0.19690799713134766,2.8334834575653076,1.2050673961639404,0.11506438255310059,0.11525797843933105,0.11341094970703125,0.11813902854919434,0.1097414493560791 diff --git a/results/combined/merges_timed/jmetal/jmetal.csv b/results/combined/merges_timed/jmetal/jmetal.csv index 8934c10c4d..36daf6acbc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -194,refs/heads/main,b4630972a8b9aebfc552e9782906bf084249fcf0,7c8c5a6039da2ea3dfc881dad1291f8246162a39,c83f2e8205bdc51687bf4740add46d495117ecc7,,True,True,True,60,124,1249.0,2,True,61,Tests_passed,ae4a3dc358e64d3098dc3c432a4fc6bae135dfae72465defeb76e50b051f282d,True,Tests_passed,881c02dc2deed33ed76364343076d24893438e237345431d336b7853feebc53c,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,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,70ef3369c01ed96b348ef412e7049812f85a0d0bac6c3073a7957e4f81e2acbc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,43d318ac538ac796b99e2d51ef751d436c8ee123ff5c6b3e2efa0bcdccb2e24a,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7ab0519df738ebb40fdff79863c77a6f21b983e5c33bd8b96590d45c6dd84d9,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,0.07122683525085449,0.07567906379699707,0.07891654968261719,0.02950763702392578,0.07793331146240234,0.07143020629882812,0.08107233047485352,0.32357120513916016,0.21947026252746582,1.5080265998840332,1.5677173137664795,0.0661470890045166,0.07041263580322266,0.05817866325378418,0.06840157508850098,0.06920862197875977 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +194,refs/heads/main,b4630972a8b9aebfc552e9782906bf084249fcf0,7c8c5a6039da2ea3dfc881dad1291f8246162a39,c83f2e8205bdc51687bf4740add46d495117ecc7,,True,True,True,60,124,1249.0,2,True,61,Tests_passed,ae4a3dc358e64d3098dc3c432a4fc6bae135dfae72465defeb76e50b051f282d,True,Tests_passed,881c02dc2deed33ed76364343076d24893438e237345431d336b7853feebc53c,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,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,70ef3369c01ed96b348ef412e7049812f85a0d0bac6c3073a7957e4f81e2acbc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,43d318ac538ac796b99e2d51ef751d436c8ee123ff5c6b3e2efa0bcdccb2e24a,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,d7ab0519df738ebb40fdff79863c77a6f21b983e5c33bd8b96590d45c6dd84d9,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,09be7c0be6395f79451c0b26407530173970914682ba7bb5dc1ac82fc629b8bc,Merge_failed,2c02862146dd0b3c244fa555239159be1d6e21ae82e0f604cb1a901e95b6b998,0.07122683525085449,0.07567906379699707,0.07891654968261719,0.02950763702392578,0.07793331146240234,0.07143020629882812,0.08107233047485352,0.32357120513916016,0.21947026252746582,1.5080265998840332,1.5677173137664795,0.0661470890045166,0.07041263580322266,0.05817866325378418,0.06840157508850098,0.06920862197875977,0.06807684898376465,0.06857490539550781,0.0718994140625,0.07100749015808105,0.0722968578338623,0.07388639450073242,0.07223105430603027,0.11953043937683105,0.15348291397094727,1.7534239292144775,1.7068688869476318,0.06963181495666504,0.06970953941345215,0.06818246841430664,0.06796073913574219,0.07020950317382812 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 e526a2d03c..bad6ca9e07 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,True,True,Tests_passed,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,True,17,73,618,3,True,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,True,17,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,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Tests_failed,ee55120005b5d0e1fecd11fab09fe6d819c41fa4a7a308f825182ce752a7cfbf,Merge_failed,c42bb2e057ad3ccab2e5628afc44a846a7faa66f782c9cb406cc36afdc9b13cc,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,e5025c327c80f007ea2445fcc7738de6227bb90221aecbaf3c0fea6d81b55ef4,Tests_passed,9341eedff949e261c63cf4474afa0fd7d6af3a714da2bda9731bb1cf7d808b65,Tests_passed,d262c5f5ea8de73279deaef9d95adc62a69e0ec1fc161e2dffa42a7db6f6f390,Tests_failed,e2d17471904df0af8203d5060db6258bb76ef03ae11c9834558b304c847436da,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,0.04708504676818848,0.04547834396362305,0.04378914833068848,0.016670942306518555,0.04729509353637695,0.042407989501953125,0.04461860656738281,0.21392178535461426,0.18015265464782715,1.2906816005706787,0.4850177764892578,0.05787968635559082,0.06524872779846191,0.05289053916931152,0.06522655487060547,0.06479883193969727 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,True,True,Tests_passed,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,True,17,73,618,3,True,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,True,17,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,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Tests_failed,ee55120005b5d0e1fecd11fab09fe6d819c41fa4a7a308f825182ce752a7cfbf,Merge_failed,c42bb2e057ad3ccab2e5628afc44a846a7faa66f782c9cb406cc36afdc9b13cc,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,e5025c327c80f007ea2445fcc7738de6227bb90221aecbaf3c0fea6d81b55ef4,Tests_passed,9341eedff949e261c63cf4474afa0fd7d6af3a714da2bda9731bb1cf7d808b65,Tests_passed,d262c5f5ea8de73279deaef9d95adc62a69e0ec1fc161e2dffa42a7db6f6f390,Tests_failed,e2d17471904df0af8203d5060db6258bb76ef03ae11c9834558b304c847436da,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,Merge_failed,9a3041e244426073512fb37a5ed06b978cad743253b21d81507b4bf2315e5919,0.04708504676818848,0.04547834396362305,0.04378914833068848,0.016670942306518555,0.04729509353637695,0.042407989501953125,0.04461860656738281,0.21392178535461426,0.18015265464782715,1.2906816005706787,0.4850177764892578,0.05787968635559082,0.06524872779846191,0.05289053916931152,0.06522655487060547,0.06479883193969727,0.0653998851776123,0.06493282318115234,0.06635022163391113,0.0632174015045166,0.06409835815429688,0.06395268440246582,0.06469535827636719,0.11317849159240723,0.14180636405944824,1.4469280242919922,0.60915207862854,0.06467676162719727,0.06495809555053711,0.06307315826416016,0.0648200511932373,0.0634617805480957 diff --git a/results/combined/merges_timed/jmrozanec/cron-utils.csv b/results/combined/merges_timed/jmrozanec/cron-utils.csv index 5275c169d0..f1660aef21 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,True,8,21,315.0,2,True,8,Tests_passed,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,True,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,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,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,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,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,51b061c59d59ca57a776764ff01daf52b5a8ca1fbd63ad112a33e7258e946a0a,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,0.0156862735748291,0.01611948013305664,0.01943373680114746,0.02686166763305664,0.020124435424804688,0.020251989364624023,0.019536495208740234,0.04855060577392578,0.07240056991577148,0.5316851139068604,0.31516122817993164,0.050406694412231445,0.07497024536132812,0.050322771072387695,0.05923914909362793,0.07569098472595215 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,True,8,21,315.0,2,True,8,Tests_passed,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,True,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,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,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,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,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,51b061c59d59ca57a776764ff01daf52b5a8ca1fbd63ad112a33e7258e946a0a,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,0.0156862735748291,0.01611948013305664,0.01943373680114746,0.02686166763305664,0.020124435424804688,0.020251989364624023,0.019536495208740234,0.04855060577392578,0.07240056991577148,0.5316851139068604,0.31516122817993164,0.050406694412231445,0.07497024536132812,0.050322771072387695,0.05923914909362793,0.07569098472595215,0.06775045394897461,0.05920052528381348,0.08069944381713867,0.06754684448242188,0.05569100379943848,0.0816962718963623,0.0814199447631836,0.1180257797241211,0.10484576225280762,0.6837782859802246,0.37817907333374023,0.057791948318481445,0.05770444869995117,0.0766148567199707,0.058794498443603516,0.06870126724243164 diff --git a/results/combined/merges_timed/jmurty/java-xmlbuilder.csv b/results/combined/merges_timed/jmurty/java-xmlbuilder.csv index b1fdba178e..67da813d2d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,False,True,7,55,204,2,True,7,Tests_passed,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,True,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,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,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,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,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1b078973301d4510df2c2f41fa2d4d986680802426ad07e6adef634b28850d38,Tests_failed,22d1bd4a71bec59cf4eee4a54639274ff27f996d5151466ce6bf216523b6ba29,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,0.011434555053710938,0.02182602882385254,0.04998421669006348,0.015978336334228516,0.051496267318725586,0.04898691177368164,0.04977273941040039,0.17703986167907715,0.11590433120727539,0.8774635791778564,0.6688826084136963,0.03167867660522461,0.05809903144836426,0.032865285873413086,0.05860018730163574,0.05900835990905762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,False,True,7,55,204,2,True,7,Tests_passed,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,True,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,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,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,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,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1b078973301d4510df2c2f41fa2d4d986680802426ad07e6adef634b28850d38,Tests_failed,22d1bd4a71bec59cf4eee4a54639274ff27f996d5151466ce6bf216523b6ba29,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,0.011434555053710938,0.02182602882385254,0.04998421669006348,0.015978336334228516,0.051496267318725586,0.04898691177368164,0.04977273941040039,0.17703986167907715,0.11590433120727539,0.8774635791778564,0.6688826084136963,0.03167867660522461,0.05809903144836426,0.032865285873413086,0.05860018730163574,0.05900835990905762,0.05793881416320801,0.05886220932006836,0.05693674087524414,0.057327985763549805,0.0586705207824707,0.05572843551635742,0.05639028549194336,0.09193587303161621,0.09461498260498047,1.02571439743042,0.8127882480621338,0.05738234519958496,0.05916285514831543,0.05811285972595215,0.0579376220703125,0.059749603271484375 diff --git a/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv b/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv index 6b04f94b0e..4c3521c672 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,True,5,29,210,2,True,5,Tests_passed,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,True,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,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,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,300473f07ece6ae9d2d64deaf036361e02229945e19838e2122d255420dd8b4e,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,0.04684591293334961,0.050606489181518555,0.042392730712890625,0.024770736694335938,0.03833436965942383,0.04034256935119629,0.04842567443847656,0.18633222579956055,0.11317563056945801,1.8918898105621338,0.41409850120544434,0.04457831382751465,0.07446146011352539,0.03548622131347656,0.07500052452087402,0.0789334774017334 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,True,5,29,210,2,True,5,Tests_passed,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,True,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,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,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,300473f07ece6ae9d2d64deaf036361e02229945e19838e2122d255420dd8b4e,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,Tests_passed,a78b9b3eb3dc4a9401395ddc6e4589d083e3ec9847ed544081b0b6d5d4d17ab1,0.04684591293334961,0.050606489181518555,0.042392730712890625,0.024770736694335938,0.03833436965942383,0.04034256935119629,0.04842567443847656,0.18633222579956055,0.11317563056945801,1.8918898105621338,0.41409850120544434,0.04457831382751465,0.07446146011352539,0.03548622131347656,0.07500052452087402,0.0789334774017334,0.0711061954498291,0.07045793533325195,0.07810139656066895,0.07132172584533691,0.07623744010925293,0.07329702377319336,0.07828354835510254,0.09386873245239258,0.1087956428527832,1.9624991416931152,0.4582233428955078,0.07618069648742676,0.07083487510681152,0.07012724876403809,0.07374858856201172,0.07401585578918457 diff --git a/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv b/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv index d271b8cbc5..227e0b3805 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,True,31,119,1957,4,True,33,Tests_passed,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,True,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,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,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,da894a9d74c2cfaeae4c3eb8d77a45fd87fcd3952e2b3e15c5f10d61c633b144,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,0.0497128963470459,0.05024909973144531,0.05640745162963867,0.021312236785888672,0.06285500526428223,0.0525968074798584,0.048598289489746094,0.3167283535003662,0.22979474067687988,2.571502685546875,1.2599132061004639,0.06955146789550781,0.06754088401794434,0.07050371170043945,0.06821250915527344,0.06841635704040527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,True,31,119,1957,4,True,33,Tests_passed,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,True,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,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,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,da894a9d74c2cfaeae4c3eb8d77a45fd87fcd3952e2b3e15c5f10d61c633b144,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,0.0497128963470459,0.05024909973144531,0.05640745162963867,0.021312236785888672,0.06285500526428223,0.0525968074798584,0.048598289489746094,0.3167283535003662,0.22979474067687988,2.571502685546875,1.2599132061004639,0.06955146789550781,0.06754088401794434,0.07050371170043945,0.06821250915527344,0.06841635704040527,0.06640958786010742,0.06594252586364746,0.06711053848266602,0.06457853317260742,0.06846904754638672,0.06395912170410156,0.06676316261291504,0.1385173797607422,0.1567370891571045,2.5675160884857178,1.291783094406128,0.06650710105895996,0.06743383407592773,0.06862449645996094,0.06384730339050293,0.06522655487060547 diff --git a/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv b/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv index d6e9e2fddc..49c57680c0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,True,True,Tests_passed,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,True,6,50,623,2,True,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,True,6,True,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,17658ca5ec7d843c7863e5f4c92fc64378540f5b81039c9bcd65abb29e591eb7,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,0e17bac82948a9e24343b4c9d0398900eaeb8aeeb7c46b7248aa191f515a0d5c,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,7c454b00ac612da406a92f617f902283d9929a4046b2577b2e1f2930cbe50d02,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,0.04593968391418457,0.044380903244018555,0.03961348533630371,0.013686895370483398,0.04321622848510742,0.043566226959228516,0.04289984703063965,0.16353154182434082,0.1208658218383789,1.7341010570526123,0.589043378829956,0.04096364974975586,0.043230295181274414,0.040991783142089844,0.060895681381225586,0.0609593391418457 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,True,True,Tests_passed,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,True,6,50,623,2,True,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,True,6,True,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,17658ca5ec7d843c7863e5f4c92fc64378540f5b81039c9bcd65abb29e591eb7,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,0e17bac82948a9e24343b4c9d0398900eaeb8aeeb7c46b7248aa191f515a0d5c,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,7c454b00ac612da406a92f617f902283d9929a4046b2577b2e1f2930cbe50d02,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,0.04593968391418457,0.044380903244018555,0.03961348533630371,0.013686895370483398,0.04321622848510742,0.043566226959228516,0.04289984703063965,0.16353154182434082,0.1208658218383789,1.7341010570526123,0.589043378829956,0.04096364974975586,0.043230295181274414,0.040991783142089844,0.060895681381225586,0.0609593391418457,0.06037092208862305,0.061202049255371094,0.060088396072387695,0.05920004844665527,0.06275010108947754,0.060941219329833984,0.06001996994018555,0.09541487693786621,0.10300135612487793,1.9073646068572998,0.7882308959960938,0.06345510482788086,0.062464237213134766,0.059814453125,0.06275463104248047,0.0595548152923584 diff --git a/results/combined/merges_timed/jnr/jnr-enxio.csv b/results/combined/merges_timed/jnr/jnr-enxio.csv index 801da9cbbf..a33c6348b1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,True,True,True,2,11,61,2,True,2,Tests_passed,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,True,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,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,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,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,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,e6693c6a9e1f211c69b6d31d9f5018433b6138e3f089bb79f748b75315701061,Tests_failed,bdf6f06b6ca36aadb0e52c1454be4aa6cb02b6a6ffdbfe12bbb7e0dbe923d957,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,0.04137611389160156,0.03892040252685547,0.023033857345581055,0.01484823226928711,0.04348587989807129,0.04316258430480957,0.045990705490112305,0.15509414672851562,0.11496925354003906,1.0193750858306885,0.32720947265625,0.030606508255004883,0.05420041084289551,0.029764890670776367,0.05382990837097168,0.05377960205078125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,True,True,True,2,11,61,2,True,2,Tests_passed,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,True,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,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,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,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,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,e6693c6a9e1f211c69b6d31d9f5018433b6138e3f089bb79f748b75315701061,Tests_failed,bdf6f06b6ca36aadb0e52c1454be4aa6cb02b6a6ffdbfe12bbb7e0dbe923d957,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,0.04137611389160156,0.03892040252685547,0.023033857345581055,0.01484823226928711,0.04348587989807129,0.04316258430480957,0.045990705490112305,0.15509414672851562,0.11496925354003906,1.0193750858306885,0.32720947265625,0.030606508255004883,0.05420041084289551,0.029764890670776367,0.05382990837097168,0.05377960205078125,0.052525997161865234,0.05097532272338867,0.05222725868225098,0.05127692222595215,0.05226898193359375,0.05352210998535156,0.05145668983459473,0.08198714256286621,0.08309507369995117,0.9971847534179688,0.3552744388580322,0.05290102958679199,0.05281400680541992,0.053623199462890625,0.05147194862365723,0.052809715270996094 diff --git a/results/combined/merges_timed/jnr/jnr-unixsocket.csv b/results/combined/merges_timed/jnr/jnr-unixsocket.csv index 8fa6be89d9..59ff43d538 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,True,True,True,16,47,1947,3,True,16,Tests_passed,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,True,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,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,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,Merge_failed,1ce6d0df9e290181e6406da43fa8ae9de5e0b266ebd915b4a14ba5552cb3c93c,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,982ccd6c9040a5cc1cd94d77c227f0577d4a8931b94f797ca5492fc81bf7f9f2,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Tests_failed,535bcff4fc8df59e29a7a522ad44349ed37d40adac99e27cee9926732a7d7e46,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,0.044419288635253906,0.041289329528808594,0.037514686584472656,0.01403045654296875,0.04430818557739258,0.04515695571899414,0.045497894287109375,0.23205280303955078,0.15510869026184082,0.8724830150604248,0.5421192646026611,0.04138803482055664,0.060678958892822266,0.042496681213378906,0.06409502029418945,0.06145119667053223 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,True,True,True,16,47,1947,3,True,16,Tests_passed,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,True,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,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,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,Merge_failed,1ce6d0df9e290181e6406da43fa8ae9de5e0b266ebd915b4a14ba5552cb3c93c,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,982ccd6c9040a5cc1cd94d77c227f0577d4a8931b94f797ca5492fc81bf7f9f2,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Tests_failed,535bcff4fc8df59e29a7a522ad44349ed37d40adac99e27cee9926732a7d7e46,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,0.044419288635253906,0.041289329528808594,0.037514686584472656,0.01403045654296875,0.04430818557739258,0.04515695571899414,0.045497894287109375,0.23205280303955078,0.15510869026184082,0.8724830150604248,0.5421192646026611,0.04138803482055664,0.060678958892822266,0.042496681213378906,0.06409502029418945,0.06145119667053223,0.06263113021850586,0.05855202674865723,0.06337285041809082,0.05929064750671387,0.23563528060913086,0.23673033714294434,0.2367100715637207,0.28286123275756836,0.2946603298187256,0.8585436344146729,0.6232128143310547,0.06510114669799805,0.06300806999206543,0.063507080078125,0.06506490707397461,0.06062173843383789 diff --git a/results/combined/merges_timed/joaoarthurbm/designwizard.csv b/results/combined/merges_timed/joaoarthurbm/designwizard.csv index 66af286fe2..d58e13b734 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,True,32,682,2444.0,6,True,33,Tests_passed,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,True,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,True,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,238b73373d281b1a2b1328af800a414dfbad7d08419b0863178608d02f9a9a2b,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,4a8baae0f5920946c7f777173a38c0963cda1649bef684e9873c24e7ee68a1cd,Merge_failed,afe57a5395a36373ecd32501f64630e4067a55aab3f8abc6ddde0dd338e68bc7,Merge_failed,afe57a5395a36373ecd32501f64630e4067a55aab3f8abc6ddde0dd338e68bc7,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,b42cb389002540c6cec7641b7212b3acf42673ad31b64283d1fa620f428f32f6,Merge_failed,756d4828023835262bb6bd62b397d04eb197f567bd5c75f9dc7c2367ea5ef5db,Merge_failed,06aaf368613dafbd0f0292c9ac53fc027d8d535f0d3096feec64ef7356510c2f,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,0.030118465423583984,0.024637699127197266,0.03443408012390137,0.02245950698852539,0.05332374572753906,0.042693376541137695,0.030167341232299805,0.2801034450531006,0.286210298538208,3.597059488296509,0.5866398811340332,0.0749666690826416,0.09493160247802734,0.0747077465057373,0.09677505493164062,0.09655427932739258 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,True,32,682,2444.0,6,True,33,Tests_passed,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,True,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,True,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,238b73373d281b1a2b1328af800a414dfbad7d08419b0863178608d02f9a9a2b,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,4a8baae0f5920946c7f777173a38c0963cda1649bef684e9873c24e7ee68a1cd,Merge_failed,afe57a5395a36373ecd32501f64630e4067a55aab3f8abc6ddde0dd338e68bc7,Merge_failed,afe57a5395a36373ecd32501f64630e4067a55aab3f8abc6ddde0dd338e68bc7,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,b42cb389002540c6cec7641b7212b3acf42673ad31b64283d1fa620f428f32f6,Merge_failed,756d4828023835262bb6bd62b397d04eb197f567bd5c75f9dc7c2367ea5ef5db,Merge_failed,06aaf368613dafbd0f0292c9ac53fc027d8d535f0d3096feec64ef7356510c2f,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,d554725981c458c8cebbb42715fdeb6fb280b4c872f2e49a66e1af73f21c272c,Merge_failed,277142731202e3993873420388dfdf38e1aac5e803e4b044cfca3fb3c4bac85c,0.030118465423583984,0.024637699127197266,0.03443408012390137,0.02245950698852539,0.05332374572753906,0.042693376541137695,0.030167341232299805,0.2801034450531006,0.286210298538208,3.597059488296509,0.5866398811340332,0.0749666690826416,0.09493160247802734,0.0747077465057373,0.09677505493164062,0.09655427932739258,0.09359526634216309,0.09150242805480957,0.09195613861083984,0.09186720848083496,0.09376978874206543,0.09026360511779785,0.0897669792175293,0.17375445365905762,0.2213301658630371,3.428082227706909,0.6891989707946777,0.09235095977783203,0.09090209007263184,0.09479165077209473,0.09270572662353516,0.0900583267211914 diff --git a/results/combined/merges_timed/jodaorg/joda-beans.csv b/results/combined/merges_timed/jodaorg/joda-beans.csv index 8ca2805faa..4148f896d8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,True,True,Tests_passed,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,True,51,124,3308,5,True,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,True,51,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,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_failed,044b6a17158f239f9fa88cf6fa2a81c3c14ff677b7ad0d55eabd345a6b73cf2e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,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,974becd4ab6b6ddb771adc7c9d8b34ba66bd75c837890d2c299b8d80bf13c4b9,Tests_failed,1ffa6f0fa602a40ebd190b853344a08a62410e2d532c7dbe451e7c053341112e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,0.021939754486083984,0.035685062408447266,0.04360556602478027,0.056139469146728516,0.023697614669799805,0.044596195220947266,0.04378795623779297,0.13222670555114746,0.24751067161560059,3.194833278656006,1.6609091758728027,0.09205937385559082,0.1627342700958252,0.0580136775970459,0.15715932846069336,0.2049720287322998 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,True,True,Tests_passed,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,True,51,124,3308,5,True,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,True,51,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,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_failed,044b6a17158f239f9fa88cf6fa2a81c3c14ff677b7ad0d55eabd345a6b73cf2e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,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,974becd4ab6b6ddb771adc7c9d8b34ba66bd75c837890d2c299b8d80bf13c4b9,Tests_failed,1ffa6f0fa602a40ebd190b853344a08a62410e2d532c7dbe451e7c053341112e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,0.021939754486083984,0.035685062408447266,0.04360556602478027,0.056139469146728516,0.023697614669799805,0.044596195220947266,0.04378795623779297,0.13222670555114746,0.24751067161560059,3.194833278656006,1.6609091758728027,0.09205937385559082,0.1627342700958252,0.0580136775970459,0.15715932846069336,0.2049720287322998,0.1444540023803711,0.1499009132385254,0.17973637580871582,0.14877700805664062,0.15123987197875977,0.14605975151062012,0.19979429244995117,0.2543368339538574,0.2542581558227539,3.4316327571868896,1.8125050067901611,0.14447951316833496,0.1458911895751953,0.14427518844604492,0.15068364143371582,0.16449689865112305 diff --git a/results/combined/merges_timed/jodastephen/property-alliance.csv b/results/combined/merges_timed/jodastephen/property-alliance.csv index 2188d206b4..2e04f2fbaa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,True,11,21,1025,3,True,11,Tests_passed,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,True,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,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,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,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,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,14dd400facfc31fa0e68a3100cf4f9af063f8bb94f9ffa2e137882b5f0fb8dad,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,0.04447579383850098,0.0353853702545166,0.04542422294616699,0.015136003494262695,0.04566454887390137,0.043085575103759766,0.045067787170410156,0.23141860961914062,0.17456340789794922,1.0964851379394531,0.3824172019958496,0.031017780303955078,0.0729074478149414,0.031265974044799805,0.0715782642364502,0.07372021675109863 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,True,11,21,1025,3,True,11,Tests_passed,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,True,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,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,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,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,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,14dd400facfc31fa0e68a3100cf4f9af063f8bb94f9ffa2e137882b5f0fb8dad,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,0.04447579383850098,0.0353853702545166,0.04542422294616699,0.015136003494262695,0.04566454887390137,0.043085575103759766,0.045067787170410156,0.23141860961914062,0.17456340789794922,1.0964851379394531,0.3824172019958496,0.031017780303955078,0.0729074478149414,0.031265974044799805,0.0715782642364502,0.07372021675109863,0.07384204864501953,0.0734255313873291,0.0741424560546875,0.0734713077545166,0.07372546195983887,0.07363677024841309,0.07287335395812988,0.12323784828186035,0.12478446960449219,1.2152998447418213,0.4650256633758545,0.07395339012145996,0.0724942684173584,0.07384300231933594,0.0730595588684082,0.07334637641906738 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 e21a4f7936..59a777b4b0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,True,True,Tests_passed,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,True,45,217,1683,9,True,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,True,45,True,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,7fb5dd686136165029f9a0e90ebe613e176283615077cf03b245ca3038ee364f,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,Merge_failed,207d4c14d9e0fda00366b995d638a7f9db18b4fcd8df3ca5e1195e7a01224aad,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,a32e8315e478d183c989b420a097f0599158fe047ae2e97c9bbf1bd02dc5851a,Merge_failed,7e4605aa7cce54dc6b8aadfd6f155b93a2305fe261607a746e0a4b7763ad77c2,Merge_failed,7e4605aa7cce54dc6b8aadfd6f155b93a2305fe261607a746e0a4b7763ad77c2,Merge_failed,7485595b9c0f1818a2fb3c2ef2739ccf27b02c1e8f896d67f4cdb948b9935007,Merge_failed,fec0165d33db690b1a1e2f2fd67d252b9fd73e3c8555303cfb39e06425d9eb22,Merge_failed,1584a8c33c6f051c706ede9490e7238da9e24b196696412156e8b6c4752c7f33,Merge_failed,24a721d99f293818a69ef8169253325e371dfa147a5ca2302626a422ddc02432,Tests_failed,6958e9440c0db94b12bb623b584765d1888469bf8d4bfbe79babe7e629d600fb,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,0.0594935417175293,0.05236530303955078,0.051554203033447266,0.02088332176208496,0.049386024475097656,0.05462050437927246,0.060712337493896484,0.6363668441772461,0.5410242080688477,6.6980626583099365,1.3578929901123047,0.08759164810180664,0.16846156120300293,0.08535289764404297,0.16900968551635742,0.15949416160583496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,True,True,Tests_passed,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,True,45,217,1683,9,True,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,True,45,True,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,7fb5dd686136165029f9a0e90ebe613e176283615077cf03b245ca3038ee364f,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,Merge_failed,207d4c14d9e0fda00366b995d638a7f9db18b4fcd8df3ca5e1195e7a01224aad,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,a32e8315e478d183c989b420a097f0599158fe047ae2e97c9bbf1bd02dc5851a,Merge_failed,7e4605aa7cce54dc6b8aadfd6f155b93a2305fe261607a746e0a4b7763ad77c2,Merge_failed,7e4605aa7cce54dc6b8aadfd6f155b93a2305fe261607a746e0a4b7763ad77c2,Merge_failed,7485595b9c0f1818a2fb3c2ef2739ccf27b02c1e8f896d67f4cdb948b9935007,Merge_failed,fec0165d33db690b1a1e2f2fd67d252b9fd73e3c8555303cfb39e06425d9eb22,Merge_failed,1584a8c33c6f051c706ede9490e7238da9e24b196696412156e8b6c4752c7f33,Merge_failed,24a721d99f293818a69ef8169253325e371dfa147a5ca2302626a422ddc02432,Tests_failed,6958e9440c0db94b12bb623b584765d1888469bf8d4bfbe79babe7e629d600fb,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,6c142fe8fbe2e6a8d6f85c601c4e2586ebc547d2f42fba4ebb09d503208a793a,Merge_failed,65a2bc9ed64c57203415362a5c0d98f1ec766a7e536b0501182b8160d1f812af,0.0594935417175293,0.05236530303955078,0.051554203033447266,0.02088332176208496,0.049386024475097656,0.05462050437927246,0.060712337493896484,0.6363668441772461,0.5410242080688477,6.6980626583099365,1.3578929901123047,0.08759164810180664,0.16846156120300293,0.08535289764404297,0.16900968551635742,0.15949416160583496,0.16082477569580078,0.1529698371887207,0.16030669212341309,0.15191149711608887,0.1700754165649414,0.17213916778564453,0.16784334182739258,0.31700706481933594,0.40127015113830566,6.95533561706543,1.4698505401611328,0.16175198554992676,0.1636509895324707,0.16063594818115234,0.16609811782836914,0.1509838104248047 diff --git a/results/combined/merges_timed/joel-costigliola/assertj-core.csv b/results/combined/merges_timed/joel-costigliola/assertj-core.csv index 3f8f2161c1..1e9fbf6725 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,True,True,Tests_passed,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,True,415,1159,31277,10,True,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,True,420,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,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,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,1bc2966befd413dcf778f315f1c13aca6c00554cb21b14f64ca141b25717d21e,Tests_failed,e6115370ec2c6994ec3088a778bf2344bffc83a54bf581a2362f5e5c0aacc088,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08054971694946289,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.5138726234436035,7.798923969268799,5.721296548843384,0.11346006393432617,0.32360410690307617,0.11841225624084473,0.3307023048400879,0.3129770755767822 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,True,True,Tests_passed,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,True,415,1159,31277,10,True,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,True,420,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,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,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,1bc2966befd413dcf778f315f1c13aca6c00554cb21b14f64ca141b25717d21e,Tests_failed,e6115370ec2c6994ec3088a778bf2344bffc83a54bf581a2362f5e5c0aacc088,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08054971694946289,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.5138726234436035,7.798923969268799,5.721296548843384,0.11346006393432617,0.32360410690307617,0.11841225624084473,0.3307023048400879,0.3129770755767822,0.3027808666229248,0.3325674533843994,0.33022642135620117,0.3250572681427002,0.33141279220581055,0.3203864097595215,0.336928129196167,0.49942874908447266,0.524846076965332,7.892807960510254,5.738695859909058,0.29582643508911133,0.32448267936706543,0.26923060417175293,0.3337123394012451,0.32080769538879395 diff --git a/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv b/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv index 99c54a8789..a353122f55 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,True,20,58,1402,4,True,20,Tests_passed,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,True,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,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,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,Tests_passed,afa5756b9250e3760a21ef7c71c61c457ffb2c9c3a1f5735f083a970d16d396b,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,3c295b97e9aba375f0af728a96f8b3659608e9a0a1588e1e9b20ec2155c0fc3b,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,c3d9e9552e39f01471eee66043c11af46cfc6f508af5b4fed147f891c238a31d,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,0.03798937797546387,0.03644275665283203,0.04597640037536621,0.015641212463378906,0.044461965560913086,0.045563697814941406,0.04413175582885742,0.224684476852417,0.21860432624816895,0.806220293045044,0.4913954734802246,0.062488555908203125,0.07612013816833496,0.05244731903076172,0.07493448257446289,0.07314419746398926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,True,20,58,1402,4,True,20,Tests_passed,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,True,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,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,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,Tests_passed,afa5756b9250e3760a21ef7c71c61c457ffb2c9c3a1f5735f083a970d16d396b,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,3c295b97e9aba375f0af728a96f8b3659608e9a0a1588e1e9b20ec2155c0fc3b,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,c3d9e9552e39f01471eee66043c11af46cfc6f508af5b4fed147f891c238a31d,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,0.03798937797546387,0.03644275665283203,0.04597640037536621,0.015641212463378906,0.044461965560913086,0.045563697814941406,0.04413175582885742,0.224684476852417,0.21860432624816895,0.806220293045044,0.4913954734802246,0.062488555908203125,0.07612013816833496,0.05244731903076172,0.07493448257446289,0.07314419746398926,0.07122039794921875,0.07261848449707031,0.07266950607299805,0.07236242294311523,0.0721290111541748,0.07348036766052246,0.07300662994384766,0.1343371868133545,0.16614603996276855,0.8633549213409424,0.5611612796783447,0.07405376434326172,0.07308292388916016,0.0744171142578125,0.07362198829650879,0.07299399375915527 diff --git a/results/combined/merges_timed/johncarl81/parceler.csv b/results/combined/merges_timed/johncarl81/parceler.csv index 9715c261a0..6e5348b529 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,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,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,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,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,75b68ab4af5b7230d8186f3e957d4f7e1af3a4ac24f33791c6787922e70c9a30,Merge_timedout,,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.02878737449645996,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.07213878631591797,1.0636169910430908,-1.0,0.04139256477355957,0.07741999626159668,0.05271196365356445,0.07939839363098145,0.07863879203796387 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,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,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,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,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,75b68ab4af5b7230d8186f3e957d4f7e1af3a4ac24f33791c6787922e70c9a30,Merge_timedout,,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.02878737449645996,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.07213878631591797,1.0636169910430908,-1.0,0.04139256477355957,0.07741999626159668,0.05271196365356445,0.07939839363098145,0.07863879203796387,0.07543826103210449,0.07757735252380371,0.08434200286865234,0.08125162124633789,0.08367371559143066,0.05981731414794922,0.08165884017944336,0.12303447723388672,0.10272955894470215,1.131626844406128,-1.0,0.07551431655883789,0.07754397392272949,0.07594704627990723,0.07925915718078613,0.07650136947631836 diff --git a/results/combined/merges_timed/johnnei/javatorrent.csv b/results/combined/merges_timed/johnnei/javatorrent.csv index af6dc8abd4..fefb12092d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,True,95,181,8627,2,True,95,Tests_passed,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,True,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,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_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,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,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,0.15433049201965332,0.14623260498046875,0.12893891334533691,0.06562137603759766,0.1604595184326172,0.14382433891296387,0.13800787925720215,0.2703728675842285,0.17521333694458008,0.09856295585632324,0.7229018211364746,0.08479642868041992,0.10261797904968262,0.06760692596435547,0.09179258346557617,0.09364438056945801 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,True,95,181,8627,2,True,95,Tests_passed,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,True,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,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_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,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,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,0.15433049201965332,0.14623260498046875,0.12893891334533691,0.06562137603759766,0.1604595184326172,0.14382433891296387,0.13800787925720215,0.2703728675842285,0.17521333694458008,0.09856295585632324,0.7229018211364746,0.08479642868041992,0.10261797904968262,0.06760692596435547,0.09179258346557617,0.09364438056945801,0.09843778610229492,0.0898897647857666,0.09551215171813965,0.09369611740112305,0.09145426750183105,0.09517383575439453,0.09491205215454102,0.12531304359436035,0.13144397735595703,0.11578893661499023,0.8040611743927002,0.10978579521179199,0.0990607738494873,0.09316635131835938,0.0891427993774414,0.08930492401123047 diff --git a/results/combined/merges_timed/jooq/jooq.csv b/results/combined/merges_timed/jooq/jooq.csv index c8f32cb690..f078e6eb12 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,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_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_failed,8b658b931135267ad53982f53b34a32ba65fc4a9bc29c9a646ebe1e80a9ff6e6,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.07988810539245605,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.17312407493591309,8.96409797668457,14.130894660949707,0.11924195289611816,0.21523165702819824,0.1193540096282959,0.21538686752319336,0.22466588020324707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,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_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_failed,8b658b931135267ad53982f53b34a32ba65fc4a9bc29c9a646ebe1e80a9ff6e6,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,Tests_passed,0b304acfcabb8baafb76bae5d487bcf118135347df108a39d862ab41ac599db9,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.07988810539245605,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.17312407493591309,8.96409797668457,14.130894660949707,0.11924195289611816,0.21523165702819824,0.1193540096282959,0.21538686752319336,0.22466588020324707,0.19616389274597168,0.2074739933013916,0.22028422355651855,0.21347832679748535,0.22357583045959473,0.2262430191040039,0.21748948097229004,0.30696964263916016,0.27437424659729004,8.593725442886353,13.88539457321167,0.20989418029785156,0.2037358283996582,0.20102500915527344,0.20602941513061523,0.2099449634552002 diff --git a/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv b/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv index 9f409621d4..7d5ab8e6fa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,1ef5b93b6804e0adea5dbb520498ac53b1f1d2ce55b6d58d10989ecb93f5eb97,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,8af8405bc980bbe2725e37145cd2fa6f6ae54e8a2144f5c4567543c1f1353f72,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,5aac72cc10859522a66f447850af6f4e3f58eea0a1ac52ddc44174abbb52617f,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,0.04706239700317383,0.04752039909362793,0.03997945785522461,0.014945745468139648,0.009907007217407227,0.009777545928955078,0.010146617889404297,0.3724863529205322,0.2910497188568115,1.1195287704467773,0.37695765495300293,0.07978606224060059,0.07665729522705078,0.07568478584289551,0.07986116409301758,0.07758784294128418 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,1ef5b93b6804e0adea5dbb520498ac53b1f1d2ce55b6d58d10989ecb93f5eb97,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,8af8405bc980bbe2725e37145cd2fa6f6ae54e8a2144f5c4567543c1f1353f72,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,5aac72cc10859522a66f447850af6f4e3f58eea0a1ac52ddc44174abbb52617f,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,0.04706239700317383,0.04752039909362793,0.03997945785522461,0.014945745468139648,0.009907007217407227,0.009777545928955078,0.010146617889404297,0.3724863529205322,0.2910497188568115,1.1195287704467773,0.37695765495300293,0.07978606224060059,0.07665729522705078,0.07568478584289551,0.07986116409301758,0.07758784294128418,0.07298111915588379,0.07328510284423828,0.07429051399230957,0.07382082939147949,0.07448554039001465,0.07359933853149414,0.0739295482635498,0.15014314651489258,0.2059617042541504,1.1719341278076172,0.44492363929748535,0.07375264167785645,0.07434606552124023,0.07464313507080078,0.07443809509277344,0.07570672035217285 diff --git a/results/combined/merges_timed/joschi/dropwizard-flyway.csv b/results/combined/merges_timed/joschi/dropwizard-flyway.csv index 3552e78989..c11bf5565a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,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,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,40eb9207ed42801ad1de9834de5a396ef5cb45349662b569b70f4b01edfc4bda,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,b4c576a399f7de4f4e134a07ddcc766844d5d60c2e9263838537aea20baf2d95,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,0.03916025161743164,0.04445385932922363,0.039504051208496094,0.016540050506591797,0.04264521598815918,0.03714466094970703,0.04491162300109863,0.17237281799316406,0.11269545555114746,0.9853577613830566,0.41072559356689453,0.04156064987182617,0.043080806732177734,0.04177975654602051,0.04391670227050781,0.06104278564453125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,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,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,40eb9207ed42801ad1de9834de5a396ef5cb45349662b569b70f4b01edfc4bda,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,b4c576a399f7de4f4e134a07ddcc766844d5d60c2e9263838537aea20baf2d95,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,0.03916025161743164,0.04445385932922363,0.039504051208496094,0.016540050506591797,0.04264521598815918,0.03714466094970703,0.04491162300109863,0.17237281799316406,0.11269545555114746,0.9853577613830566,0.41072559356689453,0.04156064987182617,0.043080806732177734,0.04177975654602051,0.04391670227050781,0.06104278564453125,0.04402875900268555,0.05887794494628906,0.04259991645812988,0.060410499572753906,0.04271292686462402,0.04277229309082031,0.04316592216491699,0.07572126388549805,0.07918286323547363,1.1746461391448975,0.5066585540771484,0.042281389236450195,0.04357624053955078,0.0441896915435791,0.04388427734375,0.06041431427001953 diff --git a/results/combined/merges_timed/joshlong/spring-birt.csv b/results/combined/merges_timed/joshlong/spring-birt.csv index 8928aed215..5d4f83316f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,True,True,Tests_passed,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,True,19,228,1143,2,True,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,True,19,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,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,877d73788c3d93c704ab07d95107d75de003d79d563e422d0e587c2f15418177,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,87a83b826e761184ecc2878ee54d6f790759d16673c042956cb04ab25b25133d,Tests_failed,c4e16425ea8e262d09b5f21ea77861ce5046b189144e47b9911c749c7a95b15f,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,0.036927223205566406,0.017066478729248047,0.05132865905761719,0.02348780632019043,0.03971219062805176,0.03368043899536133,0.034694671630859375,0.17089390754699707,0.12137079238891602,0.5011632442474365,0.4978673458099365,0.049979209899902344,0.051512718200683594,0.05161786079406738,0.049111127853393555,0.07326889038085938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,True,True,Tests_passed,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,True,19,228,1143,2,True,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,True,19,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,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,877d73788c3d93c704ab07d95107d75de003d79d563e422d0e587c2f15418177,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,87a83b826e761184ecc2878ee54d6f790759d16673c042956cb04ab25b25133d,Tests_failed,c4e16425ea8e262d09b5f21ea77861ce5046b189144e47b9911c749c7a95b15f,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,0e091801a8ec64fe9417e30823d932e9047e4c0a04eb1ab4f27baba786e91ac8,0.036927223205566406,0.017066478729248047,0.05132865905761719,0.02348780632019043,0.03971219062805176,0.03368043899536133,0.034694671630859375,0.17089390754699707,0.12137079238891602,0.5011632442474365,0.4978673458099365,0.049979209899902344,0.051512718200683594,0.05161786079406738,0.049111127853393555,0.07326889038085938,0.04968142509460449,0.06889843940734863,0.050521135330200195,0.07047295570373535,0.0499722957611084,0.0505528450012207,0.05041623115539551,0.08174943923950195,0.08900165557861328,0.5402138233184814,0.5394022464752197,0.047772884368896484,0.04964852333068848,0.047913551330566406,0.05033469200134277,0.06628870964050293 diff --git a/results/combined/merges_timed/joyent/java-manta.csv b/results/combined/merges_timed/joyent/java-manta.csv index 3da0460fcd..c5a3cdd892 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -123,refs/remotes/origin/buckets-m1,5fb0fe7ba2f3107ca1ed1b26c8e6f2d30262db6d,aad00fd5b8d53dc9c75ab14c35067898922c6215,0a0df02b8f5f8e0e90623f67d6e4ddd529fea956,,True,True,True,83.0,572,6907.0,13,True,83,Tests_passed,b33aac36e6a95ae891f9dd786b45ba17f1c83db4f20c60c78c8a0dc71acd6597,True,Tests_passed,346752f3d97f0de6b2e8fd5842337fe16436d2eac969f7e9c16677c2008cfe5c,True,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,1ab0ead4f0882c48f6ff51d6eba116c40173e242237e592e28965b35c66a38c6,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Tests_failed,e70922ff76b2a665d01de9572e846807dbdc7a88b55934c9dcd3d47db3c677cc,Merge_failed,9c157d077eb567f8b0a61fdc7422cae624ff764dd5f0f332bb691fb63054e856,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,052f58c4fc2d45c1cb189b4fba2d52d131715b026dca4d76dd4cf0aeb633e1ea,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,45ea0940bdab20ea9ee0aeb1876a63385b8dae9ab963e88f7fc2a1778252933f,Tests_failed,0825867fea3ad3ee4f7e1c7c313048bb1c08f97f923214a42e8c76f24c3feef8,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,0.04119515419006348,0.042608022689819336,0.02714395523071289,0.037308454513549805,0.04684615135192871,0.04653310775756836,0.027832746505737305,0.2538325786590576,0.6859967708587646,10.505682229995728,2.643084764480591,0.13759374618530273,0.28551244735717773,0.12639951705932617,0.2894930839538574,0.2899177074432373 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +123,refs/remotes/origin/buckets-m1,5fb0fe7ba2f3107ca1ed1b26c8e6f2d30262db6d,aad00fd5b8d53dc9c75ab14c35067898922c6215,0a0df02b8f5f8e0e90623f67d6e4ddd529fea956,,True,True,True,83.0,572,6907.0,13,True,83,Tests_passed,b33aac36e6a95ae891f9dd786b45ba17f1c83db4f20c60c78c8a0dc71acd6597,True,Tests_passed,346752f3d97f0de6b2e8fd5842337fe16436d2eac969f7e9c16677c2008cfe5c,True,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,1ab0ead4f0882c48f6ff51d6eba116c40173e242237e592e28965b35c66a38c6,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Tests_failed,e70922ff76b2a665d01de9572e846807dbdc7a88b55934c9dcd3d47db3c677cc,Merge_failed,9c157d077eb567f8b0a61fdc7422cae624ff764dd5f0f332bb691fb63054e856,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,052f58c4fc2d45c1cb189b4fba2d52d131715b026dca4d76dd4cf0aeb633e1ea,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,45ea0940bdab20ea9ee0aeb1876a63385b8dae9ab963e88f7fc2a1778252933f,Tests_failed,0825867fea3ad3ee4f7e1c7c313048bb1c08f97f923214a42e8c76f24c3feef8,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,0.04119515419006348,0.042608022689819336,0.02714395523071289,0.037308454513549805,0.04684615135192871,0.04653310775756836,0.027832746505737305,0.2538325786590576,0.6859967708587646,10.505682229995728,2.643084764480591,0.13759374618530273,0.28551244735717773,0.12639951705932617,0.2894930839538574,0.2899177074432373,0.2753772735595703,0.28406834602355957,0.2690000534057617,0.28376317024230957,0.27500057220458984,0.2856156826019287,0.2746109962463379,0.5087780952453613,0.5740046501159668,11.596527814865112,2.7401037216186523,0.2730903625488281,0.2721130847930908,0.2802410125732422,0.28624582290649414,0.2772643566131592 diff --git a/results/combined/merges_timed/jparsec/jparsec.csv b/results/combined/merges_timed/jparsec/jparsec.csv index d614ade01d..bfbfd5f019 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,True,8,7,361,2,True,8,Tests_passed,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,True,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,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,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,e7a9f9fbf05f248340e7697a85dc5c3920a2efb72eec6802e46e1bd4be1ae3e6,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,3e964f5760cc4e9db92257e2a4e7bb6c77c6770ca6f67e7c61164b827c121b67,Tests_failed,c376abf3b963dfc0c2ea67f8cec36cd3831fbdb5c0e1fe2d64e7dd4a05d0f1f7,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,0.04513430595397949,0.017541170120239258,0.012710809707641602,0.014992713928222656,0.04246854782104492,0.02685713768005371,0.02537679672241211,0.15541720390319824,0.0939328670501709,0.9674105644226074,0.33223557472229004,0.06301426887512207,0.04327106475830078,0.06256222724914551,0.04438209533691406,0.05612301826477051 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,True,8,7,361,2,True,8,Tests_passed,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,True,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,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,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,e7a9f9fbf05f248340e7697a85dc5c3920a2efb72eec6802e46e1bd4be1ae3e6,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,3e964f5760cc4e9db92257e2a4e7bb6c77c6770ca6f67e7c61164b827c121b67,Tests_failed,c376abf3b963dfc0c2ea67f8cec36cd3831fbdb5c0e1fe2d64e7dd4a05d0f1f7,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,0.04513430595397949,0.017541170120239258,0.012710809707641602,0.014992713928222656,0.04246854782104492,0.02685713768005371,0.02537679672241211,0.15541720390319824,0.0939328670501709,0.9674105644226074,0.33223557472229004,0.06301426887512207,0.04327106475830078,0.06256222724914551,0.04438209533691406,0.05612301826477051,0.04416775703430176,0.057041168212890625,0.04165983200073242,0.06367659568786621,0.04283857345581055,0.060440778732299805,0.04326987266540527,0.07935357093811035,0.1116032600402832,1.1225800514221191,0.4076089859008789,0.05881857872009277,0.05914759635925293,0.0433039665222168,0.05994725227355957,0.04348254203796387 diff --git a/results/combined/merges_timed/jpmml/openscoring.csv b/results/combined/merges_timed/jpmml/openscoring.csv index ae0141a026..3c15d034d0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,True,True,True,57,379,3131,8,True,57,Tests_passed,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,True,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,True,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,07c7b44947fe22b137a6090a70c4510439cfb6da1dd0965ec8abb25675224b75,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_timedout,,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,72f2221b17527f2a0c53d2161eb16ceeda0c77dfe73a4162f9907b1925e81e6b,Merge_failed,000931b74a25f535930dfb8ae93ab3070bf37e513851a948dd8f6041f6c1916c,Merge_failed,000931b74a25f535930dfb8ae93ab3070bf37e513851a948dd8f6041f6c1916c,Merge_failed,39a1633e474c4b9ebad22ac125daffd1aa12c606893d98f4b5b55413764652b0,Merge_failed,0fb40710dcfaf2cf63ea2a85eef3bdcf66e27d568e899ed7d99b1327592888c5,Merge_failed,0b8aa6c259c13a063d0b81e57ec0b6609d40d0c1b099889de6a6e3164d699947,Merge_failed,5f24ba130f27c9301b9ffc84e918c757f8aba034b99cb79b5f826bdf7dc7996e,Merge_timedout,,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,0.012881755828857422,0.013143539428710938,0.01459646224975586,0.023538589477539062,0.014513969421386719,0.014598846435546875,0.014631509780883789,0.10987305641174316,0.41577792167663574,2.680182695388794,-1.0,0.10622668266296387,0.12636828422546387,0.10676240921020508,0.13178133964538574,0.1328444480895996 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,True,True,True,57,379,3131,8,True,57,Tests_passed,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,True,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,True,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,07c7b44947fe22b137a6090a70c4510439cfb6da1dd0965ec8abb25675224b75,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_timedout,,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,72f2221b17527f2a0c53d2161eb16ceeda0c77dfe73a4162f9907b1925e81e6b,Merge_failed,000931b74a25f535930dfb8ae93ab3070bf37e513851a948dd8f6041f6c1916c,Merge_failed,000931b74a25f535930dfb8ae93ab3070bf37e513851a948dd8f6041f6c1916c,Merge_failed,39a1633e474c4b9ebad22ac125daffd1aa12c606893d98f4b5b55413764652b0,Merge_failed,0fb40710dcfaf2cf63ea2a85eef3bdcf66e27d568e899ed7d99b1327592888c5,Merge_failed,0b8aa6c259c13a063d0b81e57ec0b6609d40d0c1b099889de6a6e3164d699947,Merge_failed,5f24ba130f27c9301b9ffc84e918c757f8aba034b99cb79b5f826bdf7dc7996e,Merge_timedout,,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,9e5b1ab0648781b9716cca0eb272c0a205fece121365fb306ae8b7d7beffce47,Merge_failed,affbe3a480e3ffea3e6952d69900c696b9fa2808e0f2c8617287de8379960e9a,0.012881755828857422,0.013143539428710938,0.01459646224975586,0.023538589477539062,0.014513969421386719,0.014598846435546875,0.014631509780883789,0.10987305641174316,0.41577792167663574,2.680182695388794,-1.0,0.10622668266296387,0.12636828422546387,0.10676240921020508,0.13178133964538574,0.1328444480895996,0.1250920295715332,0.12708759307861328,0.12704944610595703,0.12618780136108398,0.12634968757629395,0.1292250156402588,0.12818574905395508,0.2516160011291504,0.34775495529174805,2.936352014541626,-1.0,0.12593388557434082,0.12517929077148438,0.12449884414672852,0.12218260765075684,0.1250767707824707 diff --git a/results/combined/merges_timed/jprante/elasticsearch-csv.csv b/results/combined/merges_timed/jprante/elasticsearch-csv.csv index dff14aa222..3cfa7b4a06 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,True,False,Tests_passed,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,True,5,7,11,3,True,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,True,5,True,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,243ccd4aa5a664da7b80424fe45c0414097e06098e6f18dda0a9c595c711de67,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Tests_failed,0cd9aa627b1e691826f26d76de5f034861bf05785b427d1642a08b15b20565e9,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,2081dccc2f0f074e646cb079795a9efafe1f71955185c7dd3c79a4cde2e9c6d1,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,924077c27d4074c77107ea028c726ab358d1e36f898b7eb38843a6a783f8507a,Tests_failed,2614f8f5352e38c3acf48a7655080c9b756002e8efeffba04d0d2d268e54304f,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,0.038675785064697266,0.036476850509643555,0.036406517028808594,0.013025045394897461,0.03826618194580078,0.03657817840576172,0.03289532661437988,0.22499799728393555,0.17392182350158691,0.5016427040100098,0.3531956672668457,0.03934907913208008,0.061620235443115234,0.039160966873168945,0.05952715873718262,0.05907773971557617 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,True,False,Tests_passed,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,True,5,7,11,3,True,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,True,5,True,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,243ccd4aa5a664da7b80424fe45c0414097e06098e6f18dda0a9c595c711de67,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Tests_failed,0cd9aa627b1e691826f26d76de5f034861bf05785b427d1642a08b15b20565e9,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,2081dccc2f0f074e646cb079795a9efafe1f71955185c7dd3c79a4cde2e9c6d1,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,924077c27d4074c77107ea028c726ab358d1e36f898b7eb38843a6a783f8507a,Tests_failed,2614f8f5352e38c3acf48a7655080c9b756002e8efeffba04d0d2d268e54304f,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,0.038675785064697266,0.036476850509643555,0.036406517028808594,0.013025045394897461,0.03826618194580078,0.03657817840576172,0.03289532661437988,0.22499799728393555,0.17392182350158691,0.5016427040100098,0.3531956672668457,0.03934907913208008,0.061620235443115234,0.039160966873168945,0.05952715873718262,0.05907773971557617,0.06061077117919922,0.059677839279174805,0.05936932563781738,0.06020402908325195,0.059441328048706055,0.060002803802490234,0.060357093811035156,0.10667228698730469,0.13227319717407227,0.5824973583221436,0.45528292655944824,0.05986213684082031,0.06039261817932129,0.05652260780334473,0.05894160270690918,0.058289527893066406 diff --git a/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv b/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv index 85d7e9f821..df34993c85 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,True,61,147,8302,2,True,61,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,True,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,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,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_timedout,,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,21b3eee25d6355868d34ebcd8e144247d8af9131e14c48899916f1c08decb38f,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,122b2f9b11a6609a7aa0aa932fa7c59a4b5912918b8088f14893682b054dd79e,Merge_timedout,,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,0.03400158882141113,0.037180423736572266,0.03887605667114258,0.02071094512939453,0.03706693649291992,0.0538640022277832,0.045958757400512695,0.160170316696167,0.11691474914550781,0.9762022495269775,-1.0,0.05669140815734863,0.05657005310058594,0.04814291000366211,0.056000709533691406,0.057280778884887695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,True,61,147,8302,2,True,61,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,True,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,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,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_timedout,,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,21b3eee25d6355868d34ebcd8e144247d8af9131e14c48899916f1c08decb38f,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,122b2f9b11a6609a7aa0aa932fa7c59a4b5912918b8088f14893682b054dd79e,Merge_timedout,,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,0.03400158882141113,0.037180423736572266,0.03887605667114258,0.02071094512939453,0.03706693649291992,0.0538640022277832,0.045958757400512695,0.160170316696167,0.11691474914550781,0.9762022495269775,-1.0,0.05669140815734863,0.05657005310058594,0.04814291000366211,0.056000709533691406,0.057280778884887695,0.057105302810668945,0.04882693290710449,0.05753183364868164,0.06104469299316406,0.060849905014038086,0.05956530570983887,0.05811285972595215,0.0975029468536377,0.12179899215698242,1.1100280284881592,-1.0,0.0529634952545166,0.05881047248840332,0.05777621269226074,0.05534529685974121,0.05562758445739746 diff --git a/results/combined/merges_timed/jqno/equalsverifier.csv b/results/combined/merges_timed/jqno/equalsverifier.csv index 0022b8ba24..8cf7593d88 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,True,21,43,101,2,True,21,Tests_passed,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,True,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,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,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Tests_failed,e2869bcc2d62dd9a2840f62982c7ff5fe5f02a974c6fefb6a1757dfdab4a242e,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,effb4df47b3eb030fe96839ad5ab3b2b59436ba52417d31b9b852e3f824e165b,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,5c12dfc72a47aac78bfc84120c972ba0f5af7483e8261861a6ccf3cb9a47ae75,Tests_failed,29e595ce6da652c09d814fa37ce9769d161ece05026b2ae704dd98642dbebbf4,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,0.04820656776428223,0.04416179656982422,0.04273176193237305,0.018300294876098633,0.0398404598236084,0.049901723861694336,0.04004788398742676,0.2083449363708496,0.13154053688049316,0.4497849941253662,0.5039238929748535,0.05398106575012207,0.06243419647216797,0.04584312438964844,0.04621076583862305,0.046610355377197266 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,True,21,43,101,2,True,21,Tests_passed,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,True,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,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,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Tests_failed,e2869bcc2d62dd9a2840f62982c7ff5fe5f02a974c6fefb6a1757dfdab4a242e,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,effb4df47b3eb030fe96839ad5ab3b2b59436ba52417d31b9b852e3f824e165b,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,5c12dfc72a47aac78bfc84120c972ba0f5af7483e8261861a6ccf3cb9a47ae75,Tests_failed,29e595ce6da652c09d814fa37ce9769d161ece05026b2ae704dd98642dbebbf4,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,0.04820656776428223,0.04416179656982422,0.04273176193237305,0.018300294876098633,0.0398404598236084,0.049901723861694336,0.04004788398742676,0.2083449363708496,0.13154053688049316,0.4497849941253662,0.5039238929748535,0.05398106575012207,0.06243419647216797,0.04584312438964844,0.04621076583862305,0.046610355377197266,0.06841731071472168,0.044710636138916016,0.04502296447753906,0.04466652870178223,0.04493451118469238,0.04590964317321777,0.04469919204711914,0.07920384407043457,0.10943794250488281,0.49623823165893555,0.5670371055603027,0.044071197509765625,0.04449963569641113,0.044010162353515625,0.04544711112976074,0.04508614540100098 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 d0474b76dd..f0f3f27e22 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,True,17,51,368,9,True,19,Tests_passed,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,True,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,True,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,71aa85f2bb4bf235192ebd84e02448092005e519fb1396cf2fe03b120d2bb52f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,Merge_failed,f2aff37827f8469c2a5dfe816bbc6c9851cf530bc4f74ce5162411c382890457,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,8705a6084b6dc4ff6089f4adf89f705ed236f3521f3a495090ac336ffd5f224f,Merge_failed,145f8268886c0e0f2ded8e14b45efb53e9bdac029c3181194ab87f237b119892,Merge_failed,2e60be7bb8134a7afbdadf8a941f4a02b7f60d3316f405381252e1e6e0810ba4,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,0.010405302047729492,0.011107444763183594,0.010685920715332031,0.018153905868530273,0.011071443557739258,0.010680675506591797,0.010993719100952148,0.0959007740020752,0.3494868278503418,1.6301817893981934,0.2941310405731201,0.08209848403930664,0.08320736885070801,0.0802464485168457,0.08549118041992188,0.08470439910888672 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,True,17,51,368,9,True,19,Tests_passed,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,True,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,True,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,71aa85f2bb4bf235192ebd84e02448092005e519fb1396cf2fe03b120d2bb52f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,Merge_failed,f2aff37827f8469c2a5dfe816bbc6c9851cf530bc4f74ce5162411c382890457,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,8705a6084b6dc4ff6089f4adf89f705ed236f3521f3a495090ac336ffd5f224f,Merge_failed,145f8268886c0e0f2ded8e14b45efb53e9bdac029c3181194ab87f237b119892,Merge_failed,2e60be7bb8134a7afbdadf8a941f4a02b7f60d3316f405381252e1e6e0810ba4,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,Merge_failed,e45bc8a642da6e6892d625b6a80f2ea2ae7c5c338cb52a37f1d0c6c4b1c5715b,0.010405302047729492,0.011107444763183594,0.010685920715332031,0.018153905868530273,0.011071443557739258,0.010680675506591797,0.010993719100952148,0.0959007740020752,0.3494868278503418,1.6301817893981934,0.2941310405731201,0.08209848403930664,0.08320736885070801,0.0802464485168457,0.08549118041992188,0.08470439910888672,0.0817408561706543,0.08519101142883301,0.08530068397521973,0.08347296714782715,0.08341002464294434,0.08341646194458008,0.0854041576385498,0.1968238353729248,0.264188289642334,1.937023639678955,0.4055755138397217,0.08424711227416992,0.08328366279602051,0.08601069450378418,0.08501076698303223,0.08549666404724121 diff --git a/results/combined/merges_timed/jri/deepamehta.csv b/results/combined/merges_timed/jri/deepamehta.csv index efb8599975..d7d422d5c8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -146,refs/heads/master,8e1c2670375d00738f024274b7273c52ec05c81b,081caa387b5a62846c86ba006c384b5038d3df2e,6857101de9d5664d8ed44d682a083a6024b4961c,,True,True,True,124,280,5221,8,True,124,Tests_passed,e40e9f7721447e8fe18c7966e43127a17de520b10b36b8f779bd3bedf6c93068,True,Tests_passed,6145db7ebc4f6801ae76498d47ef2990563431fdcadacc6c38b064f02a6627ed,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,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c4cc5696333344f15ff74329963f7923afd987edd8a2e76df889871042535964,Merge_failed,25fc0e6ceb7bc80a63a6483e739bc7a8d3c8037fd2bb52070304c1afc6e0dc96,Merge_failed,9192b07b1c78ca836a722c5c1a72b2a44e313f36770dddfa85987ad8f9e8c47e,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,bc59358f4f5ce24e590b6dc178c2352d432a25ab8aabd07855662d34fda3592c,Merge_failed,2c1c462dc3bd3cce7a093fede2070d5810aca4bc5213ec9018a079407c386fed,Merge_failed,cf1b8e89b2cc8c611303cf4b5e65d8267373314da865280141acabbcf00e7ecc,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,0.04775428771972656,0.05586743354797363,0.06080126762390137,0.03537297248840332,0.04080510139465332,0.0436406135559082,0.0660088062286377,0.5792105197906494,0.4381988048553467,2.4923312664031982,1.3971412181854248,0.0941457748413086,0.1880512237548828,0.08697319030761719,0.18689584732055664,0.19060516357421875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +146,refs/heads/master,8e1c2670375d00738f024274b7273c52ec05c81b,081caa387b5a62846c86ba006c384b5038d3df2e,6857101de9d5664d8ed44d682a083a6024b4961c,,True,True,True,124,280,5221,8,True,124,Tests_passed,e40e9f7721447e8fe18c7966e43127a17de520b10b36b8f779bd3bedf6c93068,True,Tests_passed,6145db7ebc4f6801ae76498d47ef2990563431fdcadacc6c38b064f02a6627ed,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,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c4cc5696333344f15ff74329963f7923afd987edd8a2e76df889871042535964,Merge_failed,25fc0e6ceb7bc80a63a6483e739bc7a8d3c8037fd2bb52070304c1afc6e0dc96,Merge_failed,9192b07b1c78ca836a722c5c1a72b2a44e313f36770dddfa85987ad8f9e8c47e,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,bc59358f4f5ce24e590b6dc178c2352d432a25ab8aabd07855662d34fda3592c,Merge_failed,2c1c462dc3bd3cce7a093fede2070d5810aca4bc5213ec9018a079407c386fed,Merge_failed,cf1b8e89b2cc8c611303cf4b5e65d8267373314da865280141acabbcf00e7ecc,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,e7e38e97ecc3fea4b8de2b56388f70382cc1307184a3953e54b30a33aca53249,Merge_failed,5325098e02bf39dc4806e58a9a12d5ed6012cf0a074b5ed0b1a613e1ba0bce4c,0.04775428771972656,0.05586743354797363,0.06080126762390137,0.03537297248840332,0.04080510139465332,0.0436406135559082,0.0660088062286377,0.5792105197906494,0.4381988048553467,2.4923312664031982,1.3971412181854248,0.0941457748413086,0.1880512237548828,0.08697319030761719,0.18689584732055664,0.19060516357421875,0.17928075790405273,0.17935872077941895,0.17792248725891113,0.17828893661499023,0.18037056922912598,0.17817473411560059,0.17632389068603516,0.3193976879119873,0.3631434440612793,2.5881147384643555,1.5820386409759521,0.17856121063232422,0.18002915382385254,0.17389988899230957,0.17723321914672852,0.17365503311157227 diff --git a/results/combined/merges_timed/jruby/bytelist.csv b/results/combined/merges_timed/jruby/bytelist.csv index ac2198c0af..0a7dd9c521 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,True,False,Tests_passed,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,True,3,12,106,3,True,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,True,3,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,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,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,4a68486dc150251c21a62359255f81bf58d8f88306a4d4e16b3d426f560757df,Tests_failed,22ac2c85d3406f277288d497bfa9a7840111238fc90b60770cb4abe41b3c474a,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,0.04558539390563965,0.05162453651428223,0.05025839805603027,0.017640113830566406,0.052640676498413086,0.017968416213989258,0.017399072647094727,0.23881816864013672,0.16987347602844238,2.4577646255493164,0.4827122688293457,0.03255438804626465,0.08442521095275879,0.0327143669128418,0.07952499389648438,0.08091378211975098 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,True,False,Tests_passed,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,True,3,12,106,3,True,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,True,3,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,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,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,4a68486dc150251c21a62359255f81bf58d8f88306a4d4e16b3d426f560757df,Tests_failed,22ac2c85d3406f277288d497bfa9a7840111238fc90b60770cb4abe41b3c474a,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,0.04558539390563965,0.05162453651428223,0.05025839805603027,0.017640113830566406,0.052640676498413086,0.017968416213989258,0.017399072647094727,0.23881816864013672,0.16987347602844238,2.4577646255493164,0.4827122688293457,0.03255438804626465,0.08442521095275879,0.0327143669128418,0.07952499389648438,0.08091378211975098,0.07570457458496094,0.07912659645080566,0.0758829116821289,0.07781410217285156,0.07907843589782715,0.07787537574768066,0.07842111587524414,0.1259760856628418,0.13127946853637695,2.4747226238250732,0.5216085910797119,0.0803530216217041,0.07731795310974121,0.07547402381896973,0.077239990234375,0.07933616638183594 diff --git a/results/combined/merges_timed/jruby/jruby-parser.csv b/results/combined/merges_timed/jruby/jruby-parser.csv index 0c75eb298b..6268d579ba 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,True,True,True,21.0,1295,20385.0,4,True,21,Tests_passed,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,True,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,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,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,Merge_failed,4d6a777d6937869b3fa7a4d14c8d25d538ed3fdabab895058512136e77851ebe,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,43ee1ec7bbb6f72bb9206ba1cdb959de78e5358eff07cd81e9b575845a46c23d,Merge_failed,f7efd4c690a5911fe48fdc3edad7c1c07a5a537364108d6309c74f1816fc25d1,Merge_failed,28fe827e81048654f242e8eb44f704336caa3d926733037d5634a699a848b6f4,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,0.03134274482727051,0.020692825317382812,0.0355219841003418,0.02932262420654297,0.03538823127746582,0.02114105224609375,0.03534054756164551,0.09032940864562988,0.20423102378845215,2.8125481605529785,4.077862024307251,0.09470486640930176,0.10509419441223145,0.10968136787414551,0.13163352012634277,0.11001324653625488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,True,True,True,21.0,1295,20385.0,4,True,21,Tests_passed,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,True,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,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,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,Merge_failed,4d6a777d6937869b3fa7a4d14c8d25d538ed3fdabab895058512136e77851ebe,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,43ee1ec7bbb6f72bb9206ba1cdb959de78e5358eff07cd81e9b575845a46c23d,Merge_failed,f7efd4c690a5911fe48fdc3edad7c1c07a5a537364108d6309c74f1816fc25d1,Merge_failed,28fe827e81048654f242e8eb44f704336caa3d926733037d5634a699a848b6f4,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,399a2b7a82c73ad8e5608985931be091f1db1037a5251816c48aeb66077b3203,Merge_failed,d908ddaf94d439a6f0d0f105410c47e1b4e50718a20469b6d89fad59c37d14a2,0.03134274482727051,0.020692825317382812,0.0355219841003418,0.02932262420654297,0.03538823127746582,0.02114105224609375,0.03534054756164551,0.09032940864562988,0.20423102378845215,2.8125481605529785,4.077862024307251,0.09470486640930176,0.10509419441223145,0.10968136787414551,0.13163352012634277,0.11001324653625488,0.11999630928039551,0.12713861465454102,0.13337302207946777,0.10416531562805176,0.10522627830505371,0.13034415245056152,0.1347498893737793,0.20646357536315918,0.23115038871765137,3.0418825149536133,4.26006555557251,0.13168954849243164,0.1266334056854248,0.10459184646606445,0.1025700569152832,0.10666036605834961 diff --git a/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv b/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv index 7a4820ca35..f7a3a4e70e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,Tests_passed,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,True,9,42,789,6,True,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,True,9,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,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Tests_failed,c9075f80d2b6cee4662a56b4b321a8b122466e94d15c0ba577d6e652d1cad57a,Merge_failed,62229186674f6820eca3a2acd21beebc90efbeb005b37f960b40e70e3f2de1d3,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,3e09a3a548c4f8c2f1825bb0db9a190e6b88863ba67ad1140e79402e6acb6207,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,52f1728c33531f6b2797ac16a8d638f51bba0385b14a9cc6fa7c1377612c10c5,Tests_failed,2f43f23e21d14dc27e221d95fbb93c6a697503bf4e4a815d39f7bd1efcc96eaa,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,0.04422640800476074,0.009732961654663086,0.04170942306518555,0.013577699661254883,0.042290687561035156,0.04277753829956055,0.04006481170654297,0.4219505786895752,0.3519744873046875,3.425719976425171,1.1271915435791016,0.07780146598815918,0.0944674015045166,0.08510756492614746,0.13385224342346191,0.11652708053588867 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,Tests_passed,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,True,9,42,789,6,True,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,True,9,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,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Tests_failed,c9075f80d2b6cee4662a56b4b321a8b122466e94d15c0ba577d6e652d1cad57a,Merge_failed,62229186674f6820eca3a2acd21beebc90efbeb005b37f960b40e70e3f2de1d3,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,3e09a3a548c4f8c2f1825bb0db9a190e6b88863ba67ad1140e79402e6acb6207,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,52f1728c33531f6b2797ac16a8d638f51bba0385b14a9cc6fa7c1377612c10c5,Tests_failed,2f43f23e21d14dc27e221d95fbb93c6a697503bf4e4a815d39f7bd1efcc96eaa,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,4303792d7e94be33cd619e75c62c24aa91cadc000de6c93b6c1d6a2e7ac3a119,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,0.04422640800476074,0.009732961654663086,0.04170942306518555,0.013577699661254883,0.042290687561035156,0.04277753829956055,0.04006481170654297,0.4219505786895752,0.3519744873046875,3.425719976425171,1.1271915435791016,0.07780146598815918,0.0944674015045166,0.08510756492614746,0.13385224342346191,0.11652708053588867,0.12769269943237305,0.1098623275756836,0.12830829620361328,0.1127474308013916,0.16738677024841309,0.16982245445251465,0.16694355010986328,0.2601785659790039,0.3106963634490967,3.4840714931488037,1.2357327938079834,0.13065481185913086,0.12792038917541504,0.13071250915527344,0.13002538681030273,0.11079025268554688 diff --git a/results/combined/merges_timed/jsevellec/cassandra-unit.csv b/results/combined/merges_timed/jsevellec/cassandra-unit.csv index f0db74f955..f11bf33411 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,True,16,36,204,5,True,18,Tests_passed,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,True,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,True,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,517120c2e25693075c1e82c3826d85bf9d7951eac716b14b683ac7a54f9c39d3,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,b25bb43ccada57e3e82a51b9e68b07708112c5aefe18cbc78a158fda650864b1,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,0.01556849479675293,0.015508890151977539,0.016070842742919922,0.016865015029907227,0.01655101776123047,0.016603946685791016,0.016771554946899414,0.056877851486206055,0.13570380210876465,1.480252742767334,0.49051833152770996,0.05571794509887695,0.06635880470275879,0.057281494140625,0.06725168228149414,0.06859064102172852 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,True,16,36,204,5,True,18,Tests_passed,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,True,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,True,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,517120c2e25693075c1e82c3826d85bf9d7951eac716b14b683ac7a54f9c39d3,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,b25bb43ccada57e3e82a51b9e68b07708112c5aefe18cbc78a158fda650864b1,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,0.01556849479675293,0.015508890151977539,0.016070842742919922,0.016865015029907227,0.01655101776123047,0.016603946685791016,0.016771554946899414,0.056877851486206055,0.13570380210876465,1.480252742767334,0.49051833152770996,0.05571794509887695,0.06635880470275879,0.057281494140625,0.06725168228149414,0.06859064102172852,0.06631350517272949,0.05758786201477051,0.06402301788330078,0.06395745277404785,0.06599950790405273,0.056299448013305664,0.054682016372680664,0.11522936820983887,0.14217424392700195,1.6235861778259277,0.5847041606903076,0.05701303482055664,0.06446290016174316,0.0626833438873291,0.05965876579284668,0.05699348449707031 diff --git a/results/combined/merges_timed/jsimone/webapp-runner.csv b/results/combined/merges_timed/jsimone/webapp-runner.csv index 6819c3167a..3f987a6e05 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,True,11,17,45,2,True,11,Tests_passed,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,True,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,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,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,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,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,1d4643386150dd1ce91773d138c8ea26a53c221b955192c6e6e8f09ae10f5e12,Tests_failed,387f09532272278d57944c48b593e7045adcf23c611911cbe0b08cf7bbf5a3fc,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,0.010222196578979492,0.01038503646850586,0.01084446907043457,0.016974210739135742,0.010523796081542969,0.010411500930786133,0.010351419448852539,0.0345308780670166,0.06463837623596191,0.6002953052520752,0.31702756881713867,0.03428316116333008,0.058209896087646484,0.03422355651855469,0.05946540832519531,0.05798935890197754 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,True,11,17,45,2,True,11,Tests_passed,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,True,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,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,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,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,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,1d4643386150dd1ce91773d138c8ea26a53c221b955192c6e6e8f09ae10f5e12,Tests_failed,387f09532272278d57944c48b593e7045adcf23c611911cbe0b08cf7bbf5a3fc,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,0.010222196578979492,0.01038503646850586,0.01084446907043457,0.016974210739135742,0.010523796081542969,0.010411500930786133,0.010351419448852539,0.0345308780670166,0.06463837623596191,0.6002953052520752,0.31702756881713867,0.03428316116333008,0.058209896087646484,0.03422355651855469,0.05946540832519531,0.05798935890197754,0.056249141693115234,0.05576181411743164,0.056257009506225586,0.05685567855834961,0.056931257247924805,0.056671142578125,0.05547595024108887,0.08938956260681152,0.08714604377746582,0.655043363571167,0.34778833389282227,0.05654335021972656,0.056375741958618164,0.05651235580444336,0.05554986000061035,0.05615878105163574 diff --git a/results/combined/merges_timed/jsprit/jsprit.csv b/results/combined/merges_timed/jsprit/jsprit.csv index 905a214770..b03d3c5137 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -197,refs/heads/master,b37ab653e14739da40750049dc273e58dc19214b,1563610bb01dc5bb2df8d3e6ab0d58042c83a459,e8d3bd03ea9bb5464c7a2fecb6cd634994216861,,True,True,True,19,53,616,2,True,19,Tests_passed,15d346de70e16c72312acb27a84f0a81ffe8dd5d066f08bcfdcdb890b981f2aa,True,Tests_passed,493f96a63746e68da33e93521ace9eea7ed25c1808b608a7a2657d42cc83e810,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,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,7834a9970414b72bf3e01c199b828f8a5f3cd020e8b991f4dab3409d654a9a6f,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,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,a2a86adbef5b29ed842cbd70d501179a2df1603f1bd92b8ba560abd51e1d9b4e,Tests_passed,7834a9970414b72bf3e01c199b828f8a5f3cd020e8b991f4dab3409d654a9a6f,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,0.012320518493652344,0.013096332550048828,0.012836933135986328,0.020839929580688477,0.01344442367553711,0.013296127319335938,0.012860774993896484,0.05891251564025879,0.06827139854431152,1.3614187240600586,1.2351739406585693,0.03776693344116211,0.06451988220214844,0.03759407997131348,0.06683635711669922,0.06833124160766602 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +197,refs/heads/master,b37ab653e14739da40750049dc273e58dc19214b,1563610bb01dc5bb2df8d3e6ab0d58042c83a459,e8d3bd03ea9bb5464c7a2fecb6cd634994216861,,True,True,True,19,53,616,2,True,19,Tests_passed,15d346de70e16c72312acb27a84f0a81ffe8dd5d066f08bcfdcdb890b981f2aa,True,Tests_passed,493f96a63746e68da33e93521ace9eea7ed25c1808b608a7a2657d42cc83e810,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,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,7834a9970414b72bf3e01c199b828f8a5f3cd020e8b991f4dab3409d654a9a6f,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,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,a2a86adbef5b29ed842cbd70d501179a2df1603f1bd92b8ba560abd51e1d9b4e,Tests_passed,7834a9970414b72bf3e01c199b828f8a5f3cd020e8b991f4dab3409d654a9a6f,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,0.012320518493652344,0.013096332550048828,0.012836933135986328,0.020839929580688477,0.01344442367553711,0.013296127319335938,0.012860774993896484,0.05891251564025879,0.06827139854431152,1.3614187240600586,1.2351739406585693,0.03776693344116211,0.06451988220214844,0.03759407997131348,0.06683635711669922,0.06833124160766602,0.06206655502319336,0.06336379051208496,0.06457328796386719,0.06464815139770508,0.06641745567321777,0.06258535385131836,0.06266546249389648,0.10037970542907715,0.09565567970275879,1.5193164348602295,1.2413334846496582,0.06474089622497559,0.0627140998840332,0.06260490417480469,0.06444597244262695,0.06458854675292969 diff --git a/results/combined/merges_timed/jtablesaw/tablesaw.csv b/results/combined/merges_timed/jtablesaw/tablesaw.csv index fe8ac4fa60..caa06485c8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,9a8d74b1e71927ad96aa3252b792349a2133ea9d7be46479383901610470d286,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,d3ae3901b3cbe4e084285f186091560f04ee178c2659a86558c8558906e92b19,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,a5e426a794ce64fee80e5160c51a904347f66fac039decaf53cd7584cd5ff2b8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.02011847496032715,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.18375468254089355,1.5412635803222656,0.7304198741912842,0.04819679260253906,0.07073307037353516,0.048645734786987305,0.0708916187286377,0.07047080993652344 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,9a8d74b1e71927ad96aa3252b792349a2133ea9d7be46479383901610470d286,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,d3ae3901b3cbe4e084285f186091560f04ee178c2659a86558c8558906e92b19,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,a5e426a794ce64fee80e5160c51a904347f66fac039decaf53cd7584cd5ff2b8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.02011847496032715,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.18375468254089355,1.5412635803222656,0.7304198741912842,0.04819679260253906,0.07073307037353516,0.048645734786987305,0.0708916187286377,0.07047080993652344,0.0663137435913086,0.0682058334350586,0.06766748428344727,0.06861329078674316,0.06807518005371094,0.06725525856018066,0.0667276382446289,0.11573338508605957,0.1253037452697754,1.5421950817108154,0.8202741146087646,0.06774640083312988,0.06596970558166504,0.06786465644836426,0.06908273696899414,0.06740522384643555 diff --git a/results/combined/merges_timed/julianhyde/linq4j.csv b/results/combined/merges_timed/julianhyde/linq4j.csv index 1843e077cd..9d416af677 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,True,False,Tests_passed,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,True,3,3,44,2,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,True,3,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_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,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,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,0.038027286529541016,0.04677748680114746,0.04836750030517578,0.03824043273925781,0.02777886390686035,0.031162500381469727,0.028319358825683594,0.058786630630493164,0.07910275459289551,0.02991199493408203,0.6774258613586426,0.06250596046447754,0.06854391098022461,0.061553239822387695,0.09669017791748047,0.0650787353515625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,True,False,Tests_passed,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,True,3,3,44,2,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,True,3,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_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,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,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,0.038027286529541016,0.04677748680114746,0.04836750030517578,0.03824043273925781,0.02777886390686035,0.031162500381469727,0.028319358825683594,0.058786630630493164,0.07910275459289551,0.02991199493408203,0.6774258613586426,0.06250596046447754,0.06854391098022461,0.061553239822387695,0.09669017791748047,0.0650787353515625,0.08509707450866699,0.0690765380859375,0.09320211410522461,0.09912467002868652,0.06933236122131348,0.09681820869445801,0.09508538246154785,0.13760161399841309,0.11237406730651855,0.10730218887329102,0.7249648571014404,0.06438064575195312,0.0868062973022461,0.09259247779846191,0.0675206184387207,0.08761429786682129 diff --git a/results/combined/merges_timed/julianhyde/sqlline.csv b/results/combined/merges_timed/julianhyde/sqlline.csv index d7e42d1145..f23d1167a1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/main,e9e0b9762242feacadca1c39e4d933b69ff39431,9ba222142dfd5bbbf5b051e69f6bc8a779b66d39,52d0509ec2f68c2bef42e4241cd43075dc95e900,,True,True,Tests_passed,a7360af2df7f3c7706cbaa67897145f1aefa1f30b3ad36854cbdce95b4b1b4f9,True,12,306,1318,4,True,Tests_passed,4cda574ad110b9c9eeaf097ac7c28d131488af3fd1cd2243f5a85c759eac682d,True,12,True,Tests_timedout,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,0.05740642547607422,0.054050445556640625,0.04953336715698242,0.022717952728271484,0.06862950325012207,0.04510927200317383,0.05371665954589844,0.3268303871154785,0.2314438819885254,5.872184991836548,3.863356590270996,0.04124808311462402,0.1327686309814453,0.04143643379211426,0.13268518447875977,0.13602399826049805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/main,e9e0b9762242feacadca1c39e4d933b69ff39431,9ba222142dfd5bbbf5b051e69f6bc8a779b66d39,52d0509ec2f68c2bef42e4241cd43075dc95e900,,True,True,Tests_passed,a7360af2df7f3c7706cbaa67897145f1aefa1f30b3ad36854cbdce95b4b1b4f9,True,12,306,1318,4,True,Tests_passed,4cda574ad110b9c9eeaf097ac7c28d131488af3fd1cd2243f5a85c759eac682d,True,12,True,Tests_timedout,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,0.05740642547607422,0.054050445556640625,0.04953336715698242,0.022717952728271484,0.06862950325012207,0.04510927200317383,0.05371665954589844,0.3268303871154785,0.2314438819885254,5.872184991836548,3.863356590270996,0.04124808311462402,0.1327686309814453,0.04143643379211426,0.13268518447875977,0.13602399826049805,0.12824702262878418,0.12668108940124512,0.12529897689819336,0.13334202766418457,0.12921547889709473,0.13123250007629395,0.1261899471282959,0.19747138023376465,0.20592617988586426,5.833187103271484,3.8866264820098877,0.1293478012084961,0.12760376930236816,0.12697696685791016,0.1257033348083496,0.1302943229675293 diff --git a/results/combined/merges_timed/julietkilo/canbabel.csv b/results/combined/merges_timed/julietkilo/canbabel.csv index 9fedf81f29..e9b6e183ed 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,True,True,True,2,32,88,2,True,2,Tests_passed,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,True,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,True,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,15ff0358b749231b7c077c1cfb879a8dcee9dffa6219b9f09edf6b73e9180e56,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,8af9683a577d5d7fc0d91702e9d283f7baf018cdac55e8744ffc43e33c2c4ee3,Tests_passed,ec8ab877f7c6e37034e60e20b5440eb5fca819ccfcd908f4f8169b16f65edeab,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,0.03681063652038574,0.05355405807495117,0.03107619285583496,0.016658306121826172,0.03315472602844238,0.03805351257324219,0.046813011169433594,0.142195463180542,0.12589597702026367,1.6158621311187744,0.3885471820831299,0.05093502998352051,0.044939279556274414,0.04252266883850098,0.0625920295715332,0.06494355201721191 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,True,True,True,2,32,88,2,True,2,Tests_passed,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,True,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,True,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,15ff0358b749231b7c077c1cfb879a8dcee9dffa6219b9f09edf6b73e9180e56,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,8af9683a577d5d7fc0d91702e9d283f7baf018cdac55e8744ffc43e33c2c4ee3,Tests_passed,ec8ab877f7c6e37034e60e20b5440eb5fca819ccfcd908f4f8169b16f65edeab,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,23a962aa325aeaa0852db9188d3ee23470d92ccacb320eda79b6afdd2f033cac,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,0.03681063652038574,0.05355405807495117,0.03107619285583496,0.016658306121826172,0.03315472602844238,0.03805351257324219,0.046813011169433594,0.142195463180542,0.12589597702026367,1.6158621311187744,0.3885471820831299,0.05093502998352051,0.044939279556274414,0.04252266883850098,0.0625920295715332,0.06494355201721191,0.06004023551940918,0.061429738998413086,0.06092548370361328,0.060228586196899414,0.060391902923583984,0.05815386772155762,0.06149864196777344,0.09240341186523438,0.09836816787719727,1.6058952808380127,0.4488987922668457,0.05981159210205078,0.0609285831451416,0.05945754051208496,0.06321310997009277,0.06002449989318848 diff --git a/results/combined/merges_timed/juniper/netconf-java.csv b/results/combined/merges_timed/juniper/netconf-java.csv index 6c285b8dff..9bd9464fa7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,True,True,Tests_passed,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,True,23,133,2132,7,True,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,True,24,True,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,a4fc21cf1377b6a54c1fc9d7f2ba7fc8e0518eba9772ec10d8c10e67db3439b1,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,4d8d3e7f76eed05232ab472f118327575ae0a304586b6f80c273b3248d914a94,Merge_failed,69579cef3f47565c40d403d7f8270f2a3ee5e5ce97b7b54e2cb39d759642344b,Merge_failed,f931366edeb217f239c0f9a7b049656dfa98a9f2fd7268c0088a1aa14084aafe,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,0.044814109802246094,0.0532529354095459,0.0481724739074707,0.0238649845123291,0.02827596664428711,0.048272132873535156,0.042092323303222656,0.41298985481262207,0.36112213134765625,1.79482102394104,0.758887767791748,0.08758068084716797,0.11664032936096191,0.08852553367614746,0.12198686599731445,0.12325167655944824 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,True,True,Tests_passed,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,True,23,133,2132,7,True,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,True,24,True,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,a4fc21cf1377b6a54c1fc9d7f2ba7fc8e0518eba9772ec10d8c10e67db3439b1,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,4d8d3e7f76eed05232ab472f118327575ae0a304586b6f80c273b3248d914a94,Merge_failed,69579cef3f47565c40d403d7f8270f2a3ee5e5ce97b7b54e2cb39d759642344b,Merge_failed,f931366edeb217f239c0f9a7b049656dfa98a9f2fd7268c0088a1aa14084aafe,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,Merge_failed,218ff364f723b84f8cf4f31a4d17726b9240f3f933d0ec10b2695186ad49aa27,0.044814109802246094,0.0532529354095459,0.0481724739074707,0.0238649845123291,0.02827596664428711,0.048272132873535156,0.042092323303222656,0.41298985481262207,0.36112213134765625,1.79482102394104,0.758887767791748,0.08758068084716797,0.11664032936096191,0.08852553367614746,0.12198686599731445,0.12325167655944824,0.1211709976196289,0.12217402458190918,0.12605667114257812,0.12425398826599121,0.12603402137756348,0.12268447875976562,0.12306618690490723,0.22462773323059082,0.2658877372741699,1.9866437911987305,0.9040317535400391,0.12239241600036621,0.12024307250976562,0.1210939884185791,0.11876392364501953,0.11956095695495605 diff --git a/results/combined/merges_timed/junit-team/junit.csv b/results/combined/merges_timed/junit-team/junit.csv index cb8b33dfac..e55398f99c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161.0,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,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_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,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_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,0.021502017974853516,0.032659292221069336,0.027190685272216797,0.03524017333984375,0.026671409606933594,0.04411482810974121,0.02713179588317871,0.07972455024719238,0.08781552314758301,0.03519558906555176,2.123708724975586,0.06419801712036133,0.08922290802001953,0.06372547149658203,0.08699369430541992,0.09061479568481445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161.0,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,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_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,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_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,0.021502017974853516,0.032659292221069336,0.027190685272216797,0.03524017333984375,0.026671409606933594,0.04411482810974121,0.02713179588317871,0.07972455024719238,0.08781552314758301,0.03519558906555176,2.123708724975586,0.06419801712036133,0.08922290802001953,0.06372547149658203,0.08699369430541992,0.09061479568481445,0.08449816703796387,0.08698654174804688,0.09491133689880371,0.08988022804260254,0.08979463577270508,0.0909121036529541,0.09012913703918457,0.13093137741088867,0.12504935264587402,0.10248088836669922,2.13909649848938,0.0844886302947998,0.08361029624938965,0.08552145957946777,0.08300065994262695,0.0861968994140625 diff --git a/results/combined/merges_timed/junit-team/junit4.csv b/results/combined/merges_timed/junit-team/junit4.csv index 7f1bab6309..926162a3a4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,Tests_passed,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,True,196,721,5889.0,7,True,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,True,197,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,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Tests_failed,2d0532130c50c50dec9453bdf10b5846b26d6d01ea2410050d983ceadea7e221,Merge_failed,d3871cdc72d7f4fb74bb8aad8531f362875239e14c0e03310f1cb868bbbea3fc,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,0682eabce520529191a0ebc918f8b7296f871a94c5cb70901ccfdc8e57482ea5,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Tests_passed,f33bc84dc35a23beeaea09881c135f696aaf2b3625379d97910848a4394c6be6,Tests_failed,05cb3bc0d7db09511b818dfc721c05cba8b9d384750e4adfe1bb4f0747674857,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.04308438301086426,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.3407559394836426,0.05164170265197754,1.7677335739135742,0.09361505508422852,0.15955686569213867,0.09598898887634277,0.1829373836517334,0.1775670051574707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,Tests_passed,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,True,196,721,5889.0,7,True,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,True,197,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,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Tests_failed,2d0532130c50c50dec9453bdf10b5846b26d6d01ea2410050d983ceadea7e221,Merge_failed,d3871cdc72d7f4fb74bb8aad8531f362875239e14c0e03310f1cb868bbbea3fc,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,0682eabce520529191a0ebc918f8b7296f871a94c5cb70901ccfdc8e57482ea5,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Tests_passed,f33bc84dc35a23beeaea09881c135f696aaf2b3625379d97910848a4394c6be6,Tests_failed,05cb3bc0d7db09511b818dfc721c05cba8b9d384750e4adfe1bb4f0747674857,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.04308438301086426,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.3407559394836426,0.05164170265197754,1.7677335739135742,0.09361505508422852,0.15955686569213867,0.09598898887634277,0.1829373836517334,0.1775670051574707,0.17028450965881348,0.1673879623413086,0.1776413917541504,0.1699683666229248,0.1741950511932373,0.17586183547973633,0.17779326438903809,0.2801625728607178,0.3039743900299072,3.3434603214263916,1.9887723922729492,0.16988897323608398,0.17312216758728027,0.17479372024536133,0.16929888725280762,0.17386746406555176 diff --git a/results/combined/merges_timed/jutzig/github-release-plugin.csv b/results/combined/merges_timed/jutzig/github-release-plugin.csv index 01d413e63a..319784227b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,True,True,Tests_passed,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,True,14,66,371,2,True,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,True,14,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,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,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,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,46f6a138c8a323eea8692d37a9d11f91fc2bc11ca2daf6d5f5dcf900046058f0,Tests_failed,f1da34f91b656b5e92d8d28cc2e7148ad9471a775d7205aeaded5329fd4b0304,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,0.04489016532897949,0.04491686820983887,0.04454350471496582,0.015429496765136719,0.04581022262573242,0.04670882225036621,0.04024147987365723,0.1550288200378418,0.10662531852722168,0.9208190441131592,0.28969407081604004,0.031304359436035156,0.05714750289916992,0.03096485137939453,0.05591630935668945,0.056348562240600586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,True,True,Tests_passed,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,True,14,66,371,2,True,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,True,14,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,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,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,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,46f6a138c8a323eea8692d37a9d11f91fc2bc11ca2daf6d5f5dcf900046058f0,Tests_failed,f1da34f91b656b5e92d8d28cc2e7148ad9471a775d7205aeaded5329fd4b0304,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,0.04489016532897949,0.04491686820983887,0.04454350471496582,0.015429496765136719,0.04581022262573242,0.04670882225036621,0.04024147987365723,0.1550288200378418,0.10662531852722168,0.9208190441131592,0.28969407081604004,0.031304359436035156,0.05714750289916992,0.03096485137939453,0.05591630935668945,0.056348562240600586,0.05651283264160156,0.0560150146484375,0.05594301223754883,0.05712890625,0.05741548538208008,0.056272268295288086,0.05641317367553711,0.09109735488891602,0.09117007255554199,1.0363411903381348,0.32910609245300293,0.056574106216430664,0.05674099922180176,0.05823516845703125,0.05726265907287598,0.05713963508605957 diff --git a/results/combined/merges_timed/jvirtanen/nassau.csv b/results/combined/merges_timed/jvirtanen/nassau.csv index 694377aec4..5ae45cf87a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,False,True,8,38,153,2,True,8,Tests_passed,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,True,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,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,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,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,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,a8b455a1e1253902490a24eb8ad9a0e86d004bfb370700ffafe4457c9dc0ac07,Tests_failed,4e1518fd9821a25f0a8c1466dfe19398fe7635105454e3e346b706b3ed23debf,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,0.011818885803222656,0.04788398742675781,0.013486146926879883,0.019608020782470703,0.04151511192321777,0.04494619369506836,0.046680450439453125,0.17043089866638184,0.10784029960632324,0.8042066097259521,0.47995853424072266,0.035807132720947266,0.060706138610839844,0.03425931930541992,0.0626223087310791,0.06351423263549805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,False,True,8,38,153,2,True,8,Tests_passed,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,True,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,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,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,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,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,a8b455a1e1253902490a24eb8ad9a0e86d004bfb370700ffafe4457c9dc0ac07,Tests_failed,4e1518fd9821a25f0a8c1466dfe19398fe7635105454e3e346b706b3ed23debf,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,0.011818885803222656,0.04788398742675781,0.013486146926879883,0.019608020782470703,0.04151511192321777,0.04494619369506836,0.046680450439453125,0.17043089866638184,0.10784029960632324,0.8042066097259521,0.47995853424072266,0.035807132720947266,0.060706138610839844,0.03425931930541992,0.0626223087310791,0.06351423263549805,0.061987876892089844,0.06212115287780762,0.06221604347229004,0.0646505355834961,0.06208634376525879,0.061869144439697266,0.06081342697143555,0.09535408020019531,0.09485793113708496,0.9369876384735107,0.5616104602813721,0.06029796600341797,0.0623018741607666,0.06296181678771973,0.059700727462768555,0.060344696044921875 diff --git a/results/combined/merges_timed/jvirtanen/parity.csv b/results/combined/merges_timed/jvirtanen/parity.csv index dd9dc4c633..7f38bf8470 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,True,7,8,20,2,True,7,Tests_passed,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,True,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,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,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,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,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,1b79f6edfa5213cd826a06139bc5287d1ad973c89482107ae2f74326855d8516,Tests_failed,6a567b494950e21dfb6a84e2fde2b70b6125164d07ce606ed8ea75442f09bd90,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,0.044388532638549805,0.05256080627441406,0.04267406463623047,0.021147727966308594,0.04100441932678223,0.04860520362854004,0.0402677059173584,0.18320155143737793,0.10764193534851074,0.6150739192962646,0.36090946197509766,0.04216766357421875,0.06092262268066406,0.04304385185241699,0.06472301483154297,0.05593252182006836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,True,7,8,20,2,True,7,Tests_passed,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,True,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,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,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,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,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,1b79f6edfa5213cd826a06139bc5287d1ad973c89482107ae2f74326855d8516,Tests_failed,6a567b494950e21dfb6a84e2fde2b70b6125164d07ce606ed8ea75442f09bd90,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,0.044388532638549805,0.05256080627441406,0.04267406463623047,0.021147727966308594,0.04100441932678223,0.04860520362854004,0.0402677059173584,0.18320155143737793,0.10764193534851074,0.6150739192962646,0.36090946197509766,0.04216766357421875,0.06092262268066406,0.04304385185241699,0.06472301483154297,0.05593252182006836,0.06649374961853027,0.06385111808776855,0.06721615791320801,0.05793261528015137,0.06930303573608398,0.06559896469116211,0.06810951232910156,0.10276651382446289,0.10073685646057129,0.7785639762878418,0.42097902297973633,0.06038546562194824,0.06586480140686035,0.06493592262268066,0.06635403633117676,0.06522107124328613 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 38e54ddc8b..955de3775b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,True,49,237,1437,3,True,49,Tests_passed,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,True,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,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,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Tests_passed,bb5b17759acc5b57443340fcefa6fab2840a0f0c560772f245f2b2053d1c2a5a,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,02d3e8ea2f5ddfee8a4cadd6653241c1e381097864819e21ead1424e77430b86,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Tests_passed,2271365bd4b8ce65dfb3b9e086678865ce92a2d8d3797caadfb20486477a4469,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.029559612274169922,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.19338178634643555,0.07060837745666504,0.5496666431427002,0.05746030807495117,0.08192229270935059,0.057633161544799805,0.08539652824401855,0.0821237564086914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,True,49,237,1437,3,True,49,Tests_passed,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,True,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,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,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Tests_passed,bb5b17759acc5b57443340fcefa6fab2840a0f0c560772f245f2b2053d1c2a5a,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,02d3e8ea2f5ddfee8a4cadd6653241c1e381097864819e21ead1424e77430b86,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Tests_passed,2271365bd4b8ce65dfb3b9e086678865ce92a2d8d3797caadfb20486477a4469,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.029559612274169922,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.19338178634643555,0.07060837745666504,0.5496666431427002,0.05746030807495117,0.08192229270935059,0.057633161544799805,0.08539652824401855,0.0821237564086914,0.07792067527770996,0.07876014709472656,0.07881522178649902,0.07696318626403809,0.07999897003173828,0.08185672760009766,0.07751035690307617,0.13081932067871094,0.14287924766540527,0.09429717063903809,0.6235387325286865,0.07731199264526367,0.07763433456420898,0.08121800422668457,0.07973694801330566,0.08122920989990234 diff --git a/results/combined/merges_timed/jwcarman/wicketopia.csv b/results/combined/merges_timed/jwcarman/wicketopia.csv index 57116ea8ac..6c440b2630 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,True,101,223,2678,10,True,101,Tests_passed,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,True,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,a50b36544c14718be3a34fa83ed28eccc09b3baf298153f90ee6f03db453c4ea,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Tests_failed,8d49a54e1c831f1338344ec1982aee661b6d5b60dd2f5261a374bc488e097918,Merge_failed,435b1c4d3fa3f679fefdcdfaa86cddae975089045e7a9587b339693dec8f53b6,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,70f65a8e9639e8c1c7c444e31e9714da4559a221d283a34625e745c50f9f72f2,Merge_failed,70f65a8e9639e8c1c7c444e31e9714da4559a221d283a34625e745c50f9f72f2,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,79c46ecced33843209ea3600639deb581d8246a30b687eff38838388b12c126a,Merge_failed,d99b259e1a6a516ec6e6906fc7dbf6975130533716608743fec0e5569fc73870,Tests_failed,293db207b59eea6851df291d26fda734f9197aa248f09602cb0e390731c93399,Tests_failed,be860926a1a189618d3627c568e5cc77c597f00a7f799cd82c0732eb886d2515,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,0.01935744285583496,0.019680023193359375,0.021474838256835938,0.030288219451904297,0.02164316177368164,0.021464824676513672,0.021564960479736328,0.15068888664245605,0.5140745639801025,3.9403882026672363,0.7985849380493164,0.09624528884887695,0.19102215766906738,0.09151625633239746,0.19412994384765625,0.20583343505859375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,True,101,223,2678,10,True,101,Tests_passed,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,True,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,a50b36544c14718be3a34fa83ed28eccc09b3baf298153f90ee6f03db453c4ea,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Tests_failed,8d49a54e1c831f1338344ec1982aee661b6d5b60dd2f5261a374bc488e097918,Merge_failed,435b1c4d3fa3f679fefdcdfaa86cddae975089045e7a9587b339693dec8f53b6,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,Merge_failed,70f65a8e9639e8c1c7c444e31e9714da4559a221d283a34625e745c50f9f72f2,Merge_failed,70f65a8e9639e8c1c7c444e31e9714da4559a221d283a34625e745c50f9f72f2,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,79c46ecced33843209ea3600639deb581d8246a30b687eff38838388b12c126a,Merge_failed,d99b259e1a6a516ec6e6906fc7dbf6975130533716608743fec0e5569fc73870,Tests_failed,293db207b59eea6851df291d26fda734f9197aa248f09602cb0e390731c93399,Tests_failed,be860926a1a189618d3627c568e5cc77c597f00a7f799cd82c0732eb886d2515,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ee64a52a57cc5a896cb1c79d4ba610a23d9e25046ece7217c0310d09a521de61,Merge_failed,ebce86f3467581089aec76d7a6652aee64f71f8ffef56225ff81e0f3b3c619be,0.01935744285583496,0.019680023193359375,0.021474838256835938,0.030288219451904297,0.02164316177368164,0.021464824676513672,0.021564960479736328,0.15068888664245605,0.5140745639801025,3.9403882026672363,0.7985849380493164,0.09624528884887695,0.19102215766906738,0.09151625633239746,0.19412994384765625,0.20583343505859375,0.18412041664123535,0.1905534267425537,0.18451714515686035,0.19420313835144043,0.19838881492614746,0.1894702911376953,0.1961803436279297,0.3556370735168457,0.4233865737915039,4.350089073181152,1.0028798580169678,0.1965951919555664,0.18483829498291016,0.19798922538757324,0.18149781227111816,0.19517779350280762 diff --git a/results/combined/merges_timed/jwtk/jjwt.csv b/results/combined/merges_timed/jwtk/jjwt.csv index 271d76afdd..3bb3838f57 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,Tests_passed,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,True,15,38,127,3,True,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,True,15,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,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Tests_failed,749ae8e0a2744e51acf85359d1c53f4dda810039fdc0f73f97952396cff2ebf4,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,70a4bb284fa9d86366112859a79a8ca1c346a788e39a5334c26cc9f2f660569d,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,e69c296d298d4cd56a9beee4ebd795bb03bb4a9452977e5f57de992cbd613602,Tests_failed,7272dda3fbe00ff257440961f83673bf06be439623d92db684c3f8bb7da8da9e,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.021558284759521484,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.17490625381469727,1.0916435718536377,0.4346957206726074,0.061177968978881836,0.06605291366577148,0.050078392028808594,0.07300901412963867,0.07086968421936035 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,Tests_passed,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,True,15,38,127,3,True,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,True,15,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,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Tests_failed,749ae8e0a2744e51acf85359d1c53f4dda810039fdc0f73f97952396cff2ebf4,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,70a4bb284fa9d86366112859a79a8ca1c346a788e39a5334c26cc9f2f660569d,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,e69c296d298d4cd56a9beee4ebd795bb03bb4a9452977e5f57de992cbd613602,Tests_failed,7272dda3fbe00ff257440961f83673bf06be439623d92db684c3f8bb7da8da9e,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.021558284759521484,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.17490625381469727,1.0916435718536377,0.4346957206726074,0.061177968978881836,0.06605291366577148,0.050078392028808594,0.07300901412963867,0.07086968421936035,0.07457494735717773,0.0668482780456543,0.07284975051879883,0.07182073593139648,0.07398319244384766,0.07410502433776855,0.06792545318603516,0.12660932540893555,0.15179967880249023,1.198326587677002,0.553278923034668,0.07351565361022949,0.07204389572143555,0.07227420806884766,0.07336235046386719,0.06849265098571777 diff --git a/results/combined/merges_timed/k3po/k3po.csv b/results/combined/merges_timed/k3po/k3po.csv index 88417aa070..fb0721fafc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,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,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,Tests_passed,9bbbe6de38c0a4dda3af86bf8faf923f1a615903910e32064022722de64d729c,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,6836286157221e218259778a19c351cdae9c9f7fb1473c2ba2777eabf51d705a,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,e1785509093650798707a1a135dffeebc8913ea0f62c372863030af81a0fe2f1,Tests_failed,edf2ba22d687b7f8a07730b5e22e47762fc1134a690762ce1e2f6a40586250d1,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.032744646072387695,0.0330965518951416,0.038622379302978516,0.04605531692504883,0.038626670837402344,0.040332794189453125,0.04014086723327637,0.10226273536682129,0.1527552604675293,2.2722971439361572,1.5751469135284424,0.10795211791992188,0.10843634605407715,0.07990312576293945,0.10950684547424316,0.10718393325805664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,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,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,Tests_passed,9bbbe6de38c0a4dda3af86bf8faf923f1a615903910e32064022722de64d729c,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,6836286157221e218259778a19c351cdae9c9f7fb1473c2ba2777eabf51d705a,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,e1785509093650798707a1a135dffeebc8913ea0f62c372863030af81a0fe2f1,Tests_failed,edf2ba22d687b7f8a07730b5e22e47762fc1134a690762ce1e2f6a40586250d1,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.032744646072387695,0.0330965518951416,0.038622379302978516,0.04605531692504883,0.038626670837402344,0.040332794189453125,0.04014086723327637,0.10226273536682129,0.1527552604675293,2.2722971439361572,1.5751469135284424,0.10795211791992188,0.10843634605407715,0.07990312576293945,0.10950684547424316,0.10718393325805664,0.1041872501373291,0.10110330581665039,0.11408090591430664,0.1098182201385498,0.11200976371765137,0.11148571968078613,0.11030888557434082,0.1667325496673584,0.1682910919189453,2.163917303085327,1.7482097148895264,0.10545039176940918,0.10364508628845215,0.10205984115600586,0.10281586647033691,0.10165667533874512 diff --git a/results/combined/merges_timed/kaazing/k3po.csv b/results/combined/merges_timed/kaazing/k3po.csv index a9f9d76b46..fc7f7e46d5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,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,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,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,5cb89d6d5e5cc8172caadec7e629d8981ef9bd0e0077f22e2e3dd66e6df1005e,Tests_failed,1baf6d325a4544b5a24b63fb8590486dccfe7913fdd0d1d645d627b8905526bf,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,0.07533717155456543,0.06656217575073242,0.05661273002624512,0.03658151626586914,0.0826873779296875,0.0925440788269043,0.07110738754272461,0.2123734951019287,0.13862895965576172,1.2090485095977783,0.7092869281768799,0.06771564483642578,0.0971977710723877,0.07011628150939941,0.09702634811401367,0.09704017639160156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,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,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,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,5cb89d6d5e5cc8172caadec7e629d8981ef9bd0e0077f22e2e3dd66e6df1005e,Tests_failed,1baf6d325a4544b5a24b63fb8590486dccfe7913fdd0d1d645d627b8905526bf,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,0.07533717155456543,0.06656217575073242,0.05661273002624512,0.03658151626586914,0.0826873779296875,0.0925440788269043,0.07110738754272461,0.2123734951019287,0.13862895965576172,1.2090485095977783,0.7092869281768799,0.06771564483642578,0.0971977710723877,0.07011628150939941,0.09702634811401367,0.09704017639160156,0.09693026542663574,0.09823989868164062,0.10508847236633301,0.10202336311340332,0.10321950912475586,0.10149526596069336,0.10465764999389648,0.15191292762756348,0.13854694366455078,1.2682163715362549,0.8327646255493164,0.09633517265319824,0.09979820251464844,0.09991717338562012,0.09623575210571289,0.09822463989257812 diff --git a/results/combined/merges_timed/kaazing/robot.csv b/results/combined/merges_timed/kaazing/robot.csv index 422ea21d64..8e85635918 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,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,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Tests_failed,0fb827ac8933363744779dd6ad1c4ff37ffbc5cd305640e7d3919667e8063d92,Tests_passed,9bbbe6de38c0a4dda3af86bf8faf923f1a615903910e32064022722de64d729c,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,01b5430a6919e37eae459bef3563173ea64c15d5af2862b6229beee0f40cef98,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,e1785509093650798707a1a135dffeebc8913ea0f62c372863030af81a0fe2f1,Tests_failed,edf2ba22d687b7f8a07730b5e22e47762fc1134a690762ce1e2f6a40586250d1,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.06378507614135742,0.07155227661132812,0.06244325637817383,0.04795575141906738,0.07654452323913574,0.0789484977722168,0.06476449966430664,0.2720298767089844,0.20291852951049805,2.176095962524414,1.6082603931427002,0.10842132568359375,0.10695433616638184,0.08000993728637695,0.11313223838806152,0.10824155807495117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,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,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Tests_failed,0fb827ac8933363744779dd6ad1c4ff37ffbc5cd305640e7d3919667e8063d92,Tests_passed,9bbbe6de38c0a4dda3af86bf8faf923f1a615903910e32064022722de64d729c,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,01b5430a6919e37eae459bef3563173ea64c15d5af2862b6229beee0f40cef98,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,e1785509093650798707a1a135dffeebc8913ea0f62c372863030af81a0fe2f1,Tests_failed,edf2ba22d687b7f8a07730b5e22e47762fc1134a690762ce1e2f6a40586250d1,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.06378507614135742,0.07155227661132812,0.06244325637817383,0.04795575141906738,0.07654452323913574,0.0789484977722168,0.06476449966430664,0.2720298767089844,0.20291852951049805,2.176095962524414,1.6082603931427002,0.10842132568359375,0.10695433616638184,0.08000993728637695,0.11313223838806152,0.10824155807495117,0.1065664291381836,0.10843133926391602,0.11484313011169434,0.11621451377868652,0.11458230018615723,0.11691689491271973,0.12148308753967285,0.17407751083374023,0.17514896392822266,2.519704580307007,1.8397305011749268,0.10640978813171387,0.10903310775756836,0.10951662063598633,0.11226654052734375,0.10860657691955566 diff --git a/results/combined/merges_timed/kamranzafar/jtar.csv b/results/combined/merges_timed/kamranzafar/jtar.csv index 0d664cfa88..1717ff3ba7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,True,True,Tests_passed,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,True,8,15,145,2,True,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,True,8,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,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,c10515ae2381e3707843a7bab0ee879e76667550c7495b05dc163911a851f309,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,0.043473243713378906,0.039542198181152344,0.04155421257019043,0.014549970626831055,0.04285478591918945,0.040624380111694336,0.043633460998535156,0.16862058639526367,0.10727953910827637,0.7597222328186035,0.4405651092529297,0.030599594116210938,0.0563201904296875,0.03054022789001465,0.05460977554321289,0.054523468017578125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,True,True,Tests_passed,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,True,8,15,145,2,True,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,True,8,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,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,c10515ae2381e3707843a7bab0ee879e76667550c7495b05dc163911a851f309,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,Tests_passed,aa60344852929db8158928d97dd3190e3b6d33ece769d0e6524cd43c79cc0125,0.043473243713378906,0.039542198181152344,0.04155421257019043,0.014549970626831055,0.04285478591918945,0.040624380111694336,0.043633460998535156,0.16862058639526367,0.10727953910827637,0.7597222328186035,0.4405651092529297,0.030599594116210938,0.0563201904296875,0.03054022789001465,0.05460977554321289,0.054523468017578125,0.0536043643951416,0.05333447456359863,0.05318140983581543,0.05463409423828125,0.05442070960998535,0.0531005859375,0.05486154556274414,0.0848088264465332,0.0854029655456543,0.777277946472168,0.46201419830322266,0.053017377853393555,0.0527496337890625,0.053205251693725586,0.05281639099121094,0.05304718017578125 diff --git a/results/combined/merges_timed/kantega/pdf-converter.csv b/results/combined/merges_timed/kantega/pdf-converter.csv index 933f551372..53009e3089 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,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_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,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_failed,400b2c155609c93c47e2b5cf5c130b20fdd1beb504cca8c3fa4fae3a5caf99ec,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,0.014321565628051758,0.08748602867126465,0.12498259544372559,0.06365299224853516,0.11461663246154785,0.10553407669067383,0.12337636947631836,0.18778014183044434,0.14156818389892578,0.6311066150665283,0.4703812599182129,0.128126859664917,0.12061738967895508,0.08827400207519531,0.12108635902404785,0.10936617851257324 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,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_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,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_failed,400b2c155609c93c47e2b5cf5c130b20fdd1beb504cca8c3fa4fae3a5caf99ec,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,0.014321565628051758,0.08748602867126465,0.12498259544372559,0.06365299224853516,0.11461663246154785,0.10553407669067383,0.12337636947631836,0.18778014183044434,0.14156818389892578,0.6311066150665283,0.4703812599182129,0.128126859664917,0.12061738967895508,0.08827400207519531,0.12108635902404785,0.10936617851257324,0.06696152687072754,0.06985902786254883,0.06805777549743652,0.11135983467102051,0.10826802253723145,0.10784339904785156,0.10837864875793457,0.10564875602722168,0.10232067108154297,0.7900207042694092,0.5698208808898926,0.06516814231872559,0.06593561172485352,0.06492805480957031,0.11564970016479492,0.10997128486633301 diff --git a/results/combined/merges_timed/kawasima/websocket-classloader.csv b/results/combined/merges_timed/kawasima/websocket-classloader.csv index cfd7f4d86f..59b161536e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,True,23,92,1005,2,True,23,Tests_passed,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,True,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,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,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,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,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,70b331fcd35375ea3c76d318bdef40c07cb85b5de474f87b08ac3c3f7a69de6e,Tests_failed,a459c2aed2e6e26148a8bcd5747550d49396432936da6b9bf033bf24f5eaeda2,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,0.008466005325317383,0.008407354354858398,0.009088993072509766,0.01502537727355957,0.008812189102172852,0.009439945220947266,0.009013652801513672,0.03141355514526367,0.06344866752624512,0.6032860279083252,0.4755721092224121,0.029973506927490234,0.05326414108276367,0.030579566955566406,0.0532989501953125,0.05317401885986328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,True,23,92,1005,2,True,23,Tests_passed,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,True,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,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,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,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,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,70b331fcd35375ea3c76d318bdef40c07cb85b5de474f87b08ac3c3f7a69de6e,Tests_failed,a459c2aed2e6e26148a8bcd5747550d49396432936da6b9bf033bf24f5eaeda2,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,0.008466005325317383,0.008407354354858398,0.009088993072509766,0.01502537727355957,0.008812189102172852,0.009439945220947266,0.009013652801513672,0.03141355514526367,0.06344866752624512,0.6032860279083252,0.4755721092224121,0.029973506927490234,0.05326414108276367,0.030579566955566406,0.0532989501953125,0.05317401885986328,0.053278207778930664,0.053117990493774414,0.05420351028442383,0.05439138412475586,0.05433297157287598,0.05367732048034668,0.05205535888671875,0.08654570579528809,0.08511614799499512,0.7431924343109131,0.5607943534851074,0.05335521697998047,0.05431818962097168,0.05260944366455078,0.053311824798583984,0.05325913429260254 diff --git a/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv b/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv index 7e056e0da6..1c34f7158f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,Tests_passed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,True,27,52,1060,2,True,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,True,27,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,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,0.04481172561645508,0.0436863899230957,0.04800128936767578,0.016712665557861328,0.049552202224731445,0.0534818172454834,0.04863238334655762,0.13271784782409668,0.044382333755493164,0.04457688331604004,0.7037014961242676,0.0297391414642334,0.034542083740234375,0.03084421157836914,0.03399157524108887,0.03426623344421387 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,Tests_passed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,True,27,52,1060,2,True,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,True,27,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,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,0.04481172561645508,0.0436863899230957,0.04800128936767578,0.016712665557861328,0.049552202224731445,0.0534818172454834,0.04863238334655762,0.13271784782409668,0.044382333755493164,0.04457688331604004,0.7037014961242676,0.0297391414642334,0.034542083740234375,0.03084421157836914,0.03399157524108887,0.03426623344421387,0.033100128173828125,0.03197789192199707,0.03383517265319824,0.03384280204772949,0.03500008583068848,0.034834861755371094,0.03376579284667969,0.05626225471496582,0.04041790962219238,0.04474592208862305,0.724036455154419,0.03342604637145996,0.032904624938964844,0.03299522399902344,0.03274798393249512,0.03339672088623047 diff --git a/results/combined/merges_timed/keedio/flume-ftp-source.csv b/results/combined/merges_timed/keedio/flume-ftp-source.csv index de02129b50..e54753d69d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,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,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,b2e5a47e68ebc9283142b33a4073a652320d975581346a52d3b34d3efbe26ede,Merge_failed,c0ad3881f0402eba31efbb062854847f9a896767cfc6e906ad81b97789a8eb08,Merge_failed,934a2870265e4a293352a939c0ce76589ad7e068b813a3838bfa1976ab3fb7e5,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,0.010106325149536133,0.010611772537231445,0.010630130767822266,0.0167233943939209,0.010619401931762695,0.010767221450805664,0.010831832885742188,0.08529043197631836,0.2842390537261963,3.167464256286621,0.5664248466491699,0.05649995803833008,0.11565613746643066,0.055614471435546875,0.11678576469421387,0.12401580810546875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,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,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,b2e5a47e68ebc9283142b33a4073a652320d975581346a52d3b34d3efbe26ede,Merge_failed,c0ad3881f0402eba31efbb062854847f9a896767cfc6e906ad81b97789a8eb08,Merge_failed,934a2870265e4a293352a939c0ce76589ad7e068b813a3838bfa1976ab3fb7e5,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,0.010106325149536133,0.010611772537231445,0.010630130767822266,0.0167233943939209,0.010619401931762695,0.010767221450805664,0.010831832885742188,0.08529043197631836,0.2842390537261963,3.167464256286621,0.5664248466491699,0.05649995803833008,0.11565613746643066,0.055614471435546875,0.11678576469421387,0.12401580810546875,0.11464905738830566,0.12102961540222168,0.11501073837280273,0.1246650218963623,0.11607646942138672,0.11463212966918945,0.11670041084289551,0.21780180931091309,0.25836706161499023,3.841026782989502,0.7466371059417725,0.1170644760131836,0.11638593673706055,0.1164999008178711,0.11589670181274414,0.12518000602722168 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 a5c539af5b..8b4a38068d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,True,17,57,1734,3,True,17,Tests_passed,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,True,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,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,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,f5572c6bd2f5e359e7b6259d3b4906515455d570a4cde37e48475e8247476271,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,0.009160518646240234,0.008647441864013672,0.008586406707763672,0.0142059326171875,0.008712530136108398,0.008571624755859375,0.008608341217041016,0.03859663009643555,0.0681757926940918,0.012252330780029297,0.8178412914276123,0.04953718185424805,0.05137896537780762,0.04991626739501953,0.05122089385986328,0.0507655143737793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,True,17,57,1734,3,True,17,Tests_passed,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,True,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,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,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,f5572c6bd2f5e359e7b6259d3b4906515455d570a4cde37e48475e8247476271,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,0.009160518646240234,0.008647441864013672,0.008586406707763672,0.0142059326171875,0.008712530136108398,0.008571624755859375,0.008608341217041016,0.03859663009643555,0.0681757926940918,0.012252330780029297,0.8178412914276123,0.04953718185424805,0.05137896537780762,0.04991626739501953,0.05122089385986328,0.0507655143737793,0.050373077392578125,0.05104327201843262,0.04985952377319336,0.051117658615112305,0.04922652244567871,0.05013632774353027,0.050989627838134766,0.09242486953735352,0.0857095718383789,0.06380200386047363,0.9492416381835938,0.05053424835205078,0.05001091957092285,0.05141305923461914,0.04959678649902344,0.050577640533447266 diff --git a/results/combined/merges_timed/kevin-wayne/algs4.csv b/results/combined/merges_timed/kevin-wayne/algs4.csv index 01745cfeaa..d510da7d56 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,False,True,4,4,13,2,True,4,Tests_passed,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,True,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,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,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,7c0fbe2074c2f4ae41d3c37aa00894444058cf8cca3cbc7c1bc99e29d52e016c,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Tests_failed,625fa2715e4c231ea9d03cb6d6778014a4b058eca65133054fc0ad1d53a2eeaf,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.03223299980163574,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.08227896690368652,0.8448219299316406,0.4309382438659668,0.04198169708251953,0.05974745750427246,0.06305217742919922,0.06338930130004883,0.06197714805603027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,False,True,4,4,13,2,True,4,Tests_passed,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,True,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,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,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,7c0fbe2074c2f4ae41d3c37aa00894444058cf8cca3cbc7c1bc99e29d52e016c,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Tests_failed,625fa2715e4c231ea9d03cb6d6778014a4b058eca65133054fc0ad1d53a2eeaf,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.03223299980163574,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.08227896690368652,0.8448219299316406,0.4309382438659668,0.04198169708251953,0.05974745750427246,0.06305217742919922,0.06338930130004883,0.06197714805603027,0.05840325355529785,0.06038308143615723,0.04288029670715332,0.05914759635925293,0.058600425720214844,0.06223654747009277,0.061235666275024414,0.0950779914855957,0.07913589477539062,0.8473072052001953,0.4664020538330078,0.06088542938232422,0.051805973052978516,0.05881643295288086,0.0598599910736084,0.05848360061645508 diff --git a/results/combined/merges_timed/kevinbayes/vest.csv b/results/combined/merges_timed/kevinbayes/vest.csv index 614f3bd48c..b4c6eab122 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,True,True,Tests_passed,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,True,6,14,284,3,True,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,True,6,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,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,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,f3a61d902921f17ee388d96053ad7d39bab4c99a65f40463e8502d8c5dece78a,Tests_passed,9acc4c97830256921b968f5c6fc0d987180d8e35f841ae8d632d9d8de12db65f,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,0.039591073989868164,0.047817230224609375,0.044217824935913086,0.01636219024658203,0.05090689659118652,0.04570651054382324,0.03459501266479492,0.22847366333007812,0.1700584888458252,0.9378302097320557,0.3059368133544922,0.03326916694641113,0.07645916938781738,0.034065961837768555,0.07566690444946289,0.07701563835144043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,True,True,Tests_passed,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,True,6,14,284,3,True,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,True,6,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,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,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,f3a61d902921f17ee388d96053ad7d39bab4c99a65f40463e8502d8c5dece78a,Tests_passed,9acc4c97830256921b968f5c6fc0d987180d8e35f841ae8d632d9d8de12db65f,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,0.039591073989868164,0.047817230224609375,0.044217824935913086,0.01636219024658203,0.05090689659118652,0.04570651054382324,0.03459501266479492,0.22847366333007812,0.1700584888458252,0.9378302097320557,0.3059368133544922,0.03326916694641113,0.07645916938781738,0.034065961837768555,0.07566690444946289,0.07701563835144043,0.07101011276245117,0.07310819625854492,0.07379007339477539,0.07334685325622559,0.07464146614074707,0.07369470596313477,0.07337045669555664,0.12418007850646973,0.12911248207092285,1.0222132205963135,0.3320002555847168,0.07420825958251953,0.07325983047485352,0.07387948036193848,0.07542705535888672,0.0754995346069336 diff --git a/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv b/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv index 361ae205fe..a1c8214e67 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,True,4,18,115,2,True,4,Tests_passed,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,True,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,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,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,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,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,ca8d615368e6adf40eee48116ab26e1b9ca88d55b2db060535ecaebbdbc674f2,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,0.05265021324157715,0.040640830993652344,0.03937268257141113,0.02091503143310547,0.05964469909667969,0.02935791015625,0.04581284523010254,0.18584394454956055,0.12288475036621094,0.8444564342498779,0.48285603523254395,0.040105342864990234,0.0675504207611084,0.03888082504272461,0.06574368476867676,0.06605982780456543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,True,4,18,115,2,True,4,Tests_passed,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,True,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,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,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,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,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,ca8d615368e6adf40eee48116ab26e1b9ca88d55b2db060535ecaebbdbc674f2,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,0.05265021324157715,0.040640830993652344,0.03937268257141113,0.02091503143310547,0.05964469909667969,0.02935791015625,0.04581284523010254,0.18584394454956055,0.12288475036621094,0.8444564342498779,0.48285603523254395,0.040105342864990234,0.0675504207611084,0.03888082504272461,0.06574368476867676,0.06605982780456543,0.06034445762634277,0.06442832946777344,0.06651020050048828,0.06583309173583984,0.05610513687133789,0.06836080551147461,0.06371188163757324,0.1021871566772461,0.09522414207458496,0.9332089424133301,0.5160510540008545,0.06470823287963867,0.062133073806762695,0.06398677825927734,0.06322693824768066,0.06209206581115723 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 4fb2a10f54..534ea2ab4f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,True,16,58,693,4,True,16,Tests_passed,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,True,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,fa27f025d59f74c522bdb23880b526ceaf45cdb0df3e878868e5476fae509f8a,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_timedout,,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,3a44cb64f7db997c499cb10f5988f9520f2816f13d6165460c7a8a7bc6dd0e83,Merge_timedout,,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,0.02451634407043457,0.04433774948120117,0.04238486289978027,0.018143177032470703,0.049483537673950195,0.044190406799316406,0.036701202392578125,0.29456472396850586,0.22649478912353516,2.20139479637146,-1.0,0.046627044677734375,0.10541510581970215,0.04434537887573242,0.10360527038574219,0.10732007026672363 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,True,16,58,693,4,True,16,Tests_passed,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,True,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,fa27f025d59f74c522bdb23880b526ceaf45cdb0df3e878868e5476fae509f8a,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_timedout,,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,3a44cb64f7db997c499cb10f5988f9520f2816f13d6165460c7a8a7bc6dd0e83,Merge_timedout,,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,Tests_passed,bc3080843ca17be750f36450326a8fc89a089c88ee3dda7f5f8140059a5fe9ff,0.02451634407043457,0.04433774948120117,0.04238486289978027,0.018143177032470703,0.049483537673950195,0.044190406799316406,0.036701202392578125,0.29456472396850586,0.22649478912353516,2.20139479637146,-1.0,0.046627044677734375,0.10541510581970215,0.04434537887573242,0.10360527038574219,0.10732007026672363,0.09821534156799316,0.09927845001220703,0.09966373443603516,0.09871602058410645,0.10124444961547852,0.09892153739929199,0.09964561462402344,0.1669621467590332,0.17740750312805176,2.2539222240448,-1.0,0.10026693344116211,0.09627342224121094,0.09894990921020508,0.0984044075012207,0.09742283821105957 diff --git a/results/combined/merges_timed/khuxtable/wagon-gitsite.csv b/results/combined/merges_timed/khuxtable/wagon-gitsite.csv index 31d38f9dca..cf4299d016 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,True,True,Tests_passed,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,True,3,37,137,3,True,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,True,3,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,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,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,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,07024d4cba7c36f75876b746e0f75d1c41a634f36115b047f8cc56bf2c139b3c,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,0.04582381248474121,0.04940962791442871,0.047598838806152344,0.018648624420166016,0.05278778076171875,0.04723978042602539,0.056243181228637695,0.23434042930603027,0.15840721130371094,1.0551486015319824,0.3432295322418213,0.033812761306762695,0.07967257499694824,0.03412675857543945,0.08028149604797363,0.08155059814453125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,True,True,Tests_passed,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,True,3,37,137,3,True,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,True,3,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,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,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,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,07024d4cba7c36f75876b746e0f75d1c41a634f36115b047f8cc56bf2c139b3c,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,0.04582381248474121,0.04940962791442871,0.047598838806152344,0.018648624420166016,0.05278778076171875,0.04723978042602539,0.056243181228637695,0.23434042930603027,0.15840721130371094,1.0551486015319824,0.3432295322418213,0.033812761306762695,0.07967257499694824,0.03412675857543945,0.08028149604797363,0.08155059814453125,0.08089423179626465,0.07559585571289062,0.08008742332458496,0.07942342758178711,0.08005571365356445,0.07957887649536133,0.0794680118560791,0.12905478477478027,0.14390945434570312,1.0898993015289307,0.37294507026672363,0.07689547538757324,0.07995939254760742,0.0798647403717041,0.07706308364868164,0.08060145378112793 diff --git a/results/combined/merges_timed/kifj/jboss-syslog.csv b/results/combined/merges_timed/kifj/jboss-syslog.csv index ffcc137ba3..9bafba9b13 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,True,2,3,10,4,True,4,Tests_passed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,True,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,True,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,0.036710500717163086,0.03805375099182129,0.035662174224853516,0.012030363082885742,0.03706836700439453,0.03135251998901367,0.03580498695373535,0.12230610847473145,0.10551786422729492,0.5099656581878662,0.25098729133605957,0.03107452392578125,0.03201770782470703,0.03103494644165039,0.03293752670288086,0.031665802001953125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,True,2,3,10,4,True,4,Tests_passed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,True,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,True,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,0.036710500717163086,0.03805375099182129,0.035662174224853516,0.012030363082885742,0.03706836700439453,0.03135251998901367,0.03580498695373535,0.12230610847473145,0.10551786422729492,0.5099656581878662,0.25098729133605957,0.03107452392578125,0.03201770782470703,0.03103494644165039,0.03293752670288086,0.031665802001953125,0.03114771842956543,0.03112030029296875,0.030747413635253906,0.030771493911743164,0.030779600143432617,0.030939340591430664,0.03096914291381836,0.062488555908203125,0.06275510787963867,0.5178630352020264,0.2796165943145752,0.03126931190490723,0.03141903877258301,0.030581951141357422,0.03031015396118164,0.029898881912231445 diff --git a/results/combined/merges_timed/killbilling/recurly-java-library.csv b/results/combined/merges_timed/killbilling/recurly-java-library.csv index 4c776f9b47..287970e75f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -222,refs/heads/master,c978e4add5640a493a55339972b2cd4363d42957,af7d25dff245056f1fc458c7b39f29e2de44d533,dcbfbb986a19c58efe3bc0b284724741ee71dc26,,True,True,Tests_passed,c250916aaa0801116200b7d417fa4fee4da50ec915837160b4f5e333d51a7198,True,74,422,3915,2,True,Tests_passed,49432ab9f96b0cc95b26258d7f928fdfd967df3d5030021d8cff6d6d28459bd3,True,74,True,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,68f617d91329ecd7ddfeb8f8c86bb9b9e4c9d7ead3a43370257c55f96c6f139f,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Tests_failed,26752c0af28aedb3eacd286965ee3478c448e464f45e2f46009d60809dcfa70c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,08e99ba149e9ac842d4ab109649a30dd00c944c7a6a41f9379fb450408768302,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,86709994f71cafbd79612a435225a5e6d55aa1d1a41cf4d5e8f16f99d9ff0667,Tests_failed,26752c0af28aedb3eacd286965ee3478c448e464f45e2f46009d60809dcfa70c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,0.06166362762451172,0.06327080726623535,0.05523419380187988,0.022324800491333008,0.05037117004394531,0.046871185302734375,0.05251312255859375,0.16933393478393555,0.1109170913696289,0.9718263149261475,1.363452434539795,0.05371665954589844,0.05512046813964844,0.060681819915771484,0.06187891960144043,0.05674147605895996 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +222,refs/heads/master,c978e4add5640a493a55339972b2cd4363d42957,af7d25dff245056f1fc458c7b39f29e2de44d533,dcbfbb986a19c58efe3bc0b284724741ee71dc26,,True,True,Tests_passed,c250916aaa0801116200b7d417fa4fee4da50ec915837160b4f5e333d51a7198,True,74,422,3915,2,True,Tests_passed,49432ab9f96b0cc95b26258d7f928fdfd967df3d5030021d8cff6d6d28459bd3,True,74,True,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,68f617d91329ecd7ddfeb8f8c86bb9b9e4c9d7ead3a43370257c55f96c6f139f,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Tests_failed,26752c0af28aedb3eacd286965ee3478c448e464f45e2f46009d60809dcfa70c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,08e99ba149e9ac842d4ab109649a30dd00c944c7a6a41f9379fb450408768302,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,86709994f71cafbd79612a435225a5e6d55aa1d1a41cf4d5e8f16f99d9ff0667,Tests_failed,26752c0af28aedb3eacd286965ee3478c448e464f45e2f46009d60809dcfa70c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,0.06166362762451172,0.06327080726623535,0.05523419380187988,0.022324800491333008,0.05037117004394531,0.046871185302734375,0.05251312255859375,0.16933393478393555,0.1109170913696289,0.9718263149261475,1.363452434539795,0.05371665954589844,0.05512046813964844,0.060681819915771484,0.06187891960144043,0.05674147605895996,0.05530738830566406,0.05546998977661133,0.05861186981201172,0.05794072151184082,0.0557863712310791,0.0548856258392334,0.06026744842529297,0.08837580680847168,0.09428620338439941,1.0033996105194092,1.432875156402588,0.060991525650024414,0.059951066970825195,0.057514190673828125,0.05398225784301758,0.05657625198364258 diff --git a/results/combined/merges_timed/killme2008/aviator.csv b/results/combined/merges_timed/killme2008/aviator.csv index 7eb955c03f..bbb8f43261 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,True,72,169,1913,2,True,72,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,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,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,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,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,4799cf20cc4cedfee78824f2ce817c74ef51228820c49619dfc6b3dcbe1c4a81,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.041605472564697266,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.11348104476928711,1.1442959308624268,1.4122865200042725,0.06541991233825684,0.09739947319030762,0.06759285926818848,0.09160137176513672,0.0956418514251709 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,True,72,169,1913,2,True,72,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,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,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,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,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,4799cf20cc4cedfee78824f2ce817c74ef51228820c49619dfc6b3dcbe1c4a81,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.041605472564697266,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.11348104476928711,1.1442959308624268,1.4122865200042725,0.06541991233825684,0.09739947319030762,0.06759285926818848,0.09160137176513672,0.0956418514251709,0.08925080299377441,0.09161686897277832,0.09894657135009766,0.09710144996643066,0.09487342834472656,0.09708046913146973,0.09361457824707031,0.14034080505371094,0.12631940841674805,1.1290287971496582,1.5356087684631348,0.0874783992767334,0.09032940864562988,0.08669090270996094,0.09008932113647461,0.08840799331665039 diff --git a/results/combined/merges_timed/killme2008/xmemcached.csv b/results/combined/merges_timed/killme2008/xmemcached.csv index b54e8ce2ae..581f524931 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,True,True,True,22,69,1208.0,2,True,22,Tests_passed,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,True,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,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,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,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,f6f4ed39e5cc887c67faafb2a250e17e66f85129ce3b0296c97bd5db0a740ce1,Tests_failed,c3ba053940a2b7dde8b98a17a816d837887640c18d0820ea5c68b521862c4294,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,0.05722308158874512,0.045677900314331055,0.049793243408203125,0.020543336868286133,0.05126309394836426,0.04123353958129883,0.0630636215209961,0.18315792083740234,0.11241269111633301,1.2416026592254639,0.8587315082550049,0.03983283042907715,0.06619691848754883,0.04110240936279297,0.06743192672729492,0.06965517997741699 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,True,True,True,22,69,1208.0,2,True,22,Tests_passed,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,True,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,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,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,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,f6f4ed39e5cc887c67faafb2a250e17e66f85129ce3b0296c97bd5db0a740ce1,Tests_failed,c3ba053940a2b7dde8b98a17a816d837887640c18d0820ea5c68b521862c4294,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,0.05722308158874512,0.045677900314331055,0.049793243408203125,0.020543336868286133,0.05126309394836426,0.04123353958129883,0.0630636215209961,0.18315792083740234,0.11241269111633301,1.2416026592254639,0.8587315082550049,0.03983283042907715,0.06619691848754883,0.04110240936279297,0.06743192672729492,0.06965517997741699,0.06171989440917969,0.06717705726623535,0.06508684158325195,0.06389427185058594,0.0656588077545166,0.06690502166748047,0.06499361991882324,0.10165691375732422,0.09570550918579102,1.2233309745788574,0.8601939678192139,0.06364083290100098,0.06654524803161621,0.06304645538330078,0.09097456932067871,0.06618452072143555 diff --git a/results/combined/merges_timed/kimshen/sissi.csv b/results/combined/merges_timed/kimshen/sissi.csv index e6c9328e12..c32afda440 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,True,True,True,14,48,242,15,True,23,Tests_passed,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,True,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,True,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,53d123afb24f47d961ea8942afd8fc2c33be2e18cfc47ae8edda13882fc9769f,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,b7fe52e917e98c7e547004ad90c0b53ec76505eb721401d525dc9b10bf4098c4,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,0cde743c392db333ec572afb015dd3d24b6edb5b06edd6e98581e2a82d5a5701,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,0.04781651496887207,0.05108022689819336,0.0421292781829834,0.016379594802856445,0.011893272399902344,0.04361081123352051,0.04788994789123535,0.43448400497436523,0.36437153816223145,1.86000394821167,0.5096244812011719,0.08697128295898438,0.09281373023986816,0.08886218070983887,0.09279894828796387,0.09037995338439941 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,True,True,True,14,48,242,15,True,23,Tests_passed,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,True,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,True,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,53d123afb24f47d961ea8942afd8fc2c33be2e18cfc47ae8edda13882fc9769f,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,b7fe52e917e98c7e547004ad90c0b53ec76505eb721401d525dc9b10bf4098c4,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,0cde743c392db333ec572afb015dd3d24b6edb5b06edd6e98581e2a82d5a5701,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,0.04781651496887207,0.05108022689819336,0.0421292781829834,0.016379594802856445,0.011893272399902344,0.04361081123352051,0.04788994789123535,0.43448400497436523,0.36437153816223145,1.86000394821167,0.5096244812011719,0.08697128295898438,0.09281373023986816,0.08886218070983887,0.09279894828796387,0.09037995338439941,0.09311318397521973,0.09178853034973145,0.09308528900146484,0.0919945240020752,0.09233927726745605,0.09360456466674805,0.09201240539550781,0.19174504280090332,0.2598743438720703,2.1344337463378906,0.6383316516876221,0.09313678741455078,0.09157943725585938,0.09212183952331543,0.09263992309570312,0.09137916564941406 diff --git a/results/combined/merges_timed/kinow/testlink-java-api.csv b/results/combined/merges_timed/kinow/testlink-java-api.csv index 630fb64d4b..bb2fab9d58 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,True,True,Tests_passed,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,True,18,114,635,2,True,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,True,18,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,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,bc28846c9d6e0796d60384b1aeab80368a2592f57a83245b1e9b9279eb5a01aa,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,59f088e07232a21291a81be2ab3827beda072fb7edf829244ec925dcf819c959,Tests_failed,460592dc899b35f995f46f92867eb69ed427a2155aab89474e63b90499432629,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,0.016411781311035156,0.0167083740234375,0.019654512405395508,0.030248165130615234,0.019420862197875977,0.019756793975830078,0.018632888793945312,0.04755210876464844,0.07191228866577148,1.0424895286560059,0.7360870838165283,0.035285234451293945,0.07805633544921875,0.05327653884887695,0.08153629302978516,0.08195614814758301 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,True,True,Tests_passed,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,True,18,114,635,2,True,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,True,18,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,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,bc28846c9d6e0796d60384b1aeab80368a2592f57a83245b1e9b9279eb5a01aa,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,59f088e07232a21291a81be2ab3827beda072fb7edf829244ec925dcf819c959,Tests_failed,460592dc899b35f995f46f92867eb69ed427a2155aab89474e63b90499432629,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,4dbd0291cf556303e55d0a1f33173feea303d1c98b85ef240b6e4365bb41cb25,Tests_passed,74688f97e537a747a2ebefe41dee02e77cf16538f7e1e094f119046d821dba81,0.016411781311035156,0.0167083740234375,0.019654512405395508,0.030248165130615234,0.019420862197875977,0.019756793975830078,0.018632888793945312,0.04755210876464844,0.07191228866577148,1.0424895286560059,0.7360870838165283,0.035285234451293945,0.07805633544921875,0.05327653884887695,0.08153629302978516,0.08195614814758301,0.07817792892456055,0.06491684913635254,0.08396029472351074,0.07955336570739746,0.08066248893737793,0.06423544883728027,0.08232998847961426,0.11802124977111816,0.1158137321472168,1.1715428829193115,0.8016018867492676,0.07615303993225098,0.07456111907958984,0.0774545669555664,0.07732224464416504,0.08261847496032715 diff --git a/results/combined/merges_timed/kohsuke/access-modifier.csv b/results/combined/merges_timed/kohsuke/access-modifier.csv index 5c59eaea1d..437a151e84 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,True,32,124,574,4,True,32,Tests_passed,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,True,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,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,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,e73eb1e96fcf53e454dab88ec6aaa3a4f8a8165795bb25313d7335c3dc05c56d,Merge_failed,c3cf79114cc24f09fcaed7c697203c42ef8820bffe1f168067cf45f97c1e0a5c,Tests_passed,a062f23c7ce52adc6a07aee078a459e9587db37938e9f95d70ae3cdafc633906,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,0.054320335388183594,0.045144081115722656,0.052400827407836914,0.02096271514892578,0.0480961799621582,0.046134233474731445,0.04922771453857422,0.3003063201904297,0.2335798740386963,1.7428174018859863,0.46889400482177734,0.05801701545715332,0.08194899559020996,0.06160116195678711,0.08849167823791504,0.08872866630554199 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,True,32,124,574,4,True,32,Tests_passed,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,True,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,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,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,e73eb1e96fcf53e454dab88ec6aaa3a4f8a8165795bb25313d7335c3dc05c56d,Merge_failed,c3cf79114cc24f09fcaed7c697203c42ef8820bffe1f168067cf45f97c1e0a5c,Tests_passed,a062f23c7ce52adc6a07aee078a459e9587db37938e9f95d70ae3cdafc633906,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,Merge_failed,c9c8c18cf9ed67e4e43999a6ecd1c890241c306817341806d4ad508df8dd492e,0.054320335388183594,0.045144081115722656,0.052400827407836914,0.02096271514892578,0.0480961799621582,0.046134233474731445,0.04922771453857422,0.3003063201904297,0.2335798740386963,1.7428174018859863,0.46889400482177734,0.05801701545715332,0.08194899559020996,0.06160116195678711,0.08849167823791504,0.08872866630554199,0.08171439170837402,0.08362770080566406,0.08166170120239258,0.08232450485229492,0.08244967460632324,0.0828855037689209,0.08173298835754395,0.14519119262695312,0.16391301155090332,1.828521490097046,0.5354361534118652,0.08619356155395508,0.08183097839355469,0.08535003662109375,0.08506536483764648,0.0796501636505127 diff --git a/results/combined/merges_timed/kohsuke/file-leak-detector.csv b/results/combined/merges_timed/kohsuke/file-leak-detector.csv index 92c61d2024..e8f0735cec 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,True,True,Tests_passed,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,True,15,56,446,4,True,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,True,15,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,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,f01c1c6f8691222473b89b34a03fdcc8752ad370f88ff3ad338e51ddee6b59f8,Merge_failed,28550d3b38968f42ae0c63fc647f4f28fec2bdc1e93b1b5676c9e510cc3178ad,Merge_failed,0e14353700addae745f45a8038070fd7212c43b79ea88797a3283e40cf832ecd,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,0.04591536521911621,0.04432392120361328,0.04338550567626953,0.014572858810424805,0.03096747398376465,0.043947458267211914,0.04537844657897949,0.28107142448425293,0.22930526733398438,1.6485943794250488,0.3666653633117676,0.05078911781311035,0.08141112327575684,0.052443742752075195,0.08287286758422852,0.08138585090637207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,True,True,Tests_passed,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,True,15,56,446,4,True,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,True,15,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,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,f01c1c6f8691222473b89b34a03fdcc8752ad370f88ff3ad338e51ddee6b59f8,Merge_failed,28550d3b38968f42ae0c63fc647f4f28fec2bdc1e93b1b5676c9e510cc3178ad,Merge_failed,0e14353700addae745f45a8038070fd7212c43b79ea88797a3283e40cf832ecd,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,Merge_failed,ef311fd61dde6f2f397e227bb485d291c203844e47056371c50e6aa410911c94,0.04591536521911621,0.04432392120361328,0.04338550567626953,0.014572858810424805,0.03096747398376465,0.043947458267211914,0.04537844657897949,0.28107142448425293,0.22930526733398438,1.6485943794250488,0.3666653633117676,0.05078911781311035,0.08141112327575684,0.052443742752075195,0.08287286758422852,0.08138585090637207,0.07877016067504883,0.07819151878356934,0.0778665542602539,0.07887840270996094,0.07896184921264648,0.07858824729919434,0.07687640190124512,0.14078283309936523,0.15987133979797363,1.6841280460357666,0.4336991310119629,0.07788562774658203,0.07830357551574707,0.08110547065734863,0.07661652565002441,0.07956647872924805 diff --git a/results/combined/merges_timed/kohsuke/github-api.csv b/results/combined/merges_timed/kohsuke/github-api.csv index ffd547bd97..c5fdae4305 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,True,150.0,181,11496.0,4,True,151,Tests_passed,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,True,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,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,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_failed,0defa153bfe022758b30cad0bbb395450d761fe861d929062d29442b5bb54b5c,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,0.039922475814819336,0.04012465476989746,0.05130577087402344,0.06493449211120605,0.05168867111206055,0.05164790153503418,0.051000118255615234,0.11913061141967773,0.15013384819030762,0.04344534873962402,1.1502768993377686,0.10362648963928223,0.18626141548156738,0.10315179824829102,0.17943930625915527,0.19076156616210938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,True,150.0,181,11496.0,4,True,151,Tests_passed,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,True,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,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,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_failed,0defa153bfe022758b30cad0bbb395450d761fe861d929062d29442b5bb54b5c,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,Tests_passed,7d20c37caa07f556aff780068c17d43da26fc919a5ddc02766293e17e96c6890,0.039922475814819336,0.04012465476989746,0.05130577087402344,0.06493449211120605,0.05168867111206055,0.05164790153503418,0.051000118255615234,0.11913061141967773,0.15013384819030762,0.04344534873962402,1.1502768993377686,0.10362648963928223,0.18626141548156738,0.10315179824829102,0.17943930625915527,0.19076156616210938,0.17576074600219727,0.17843222618103027,0.18419456481933594,0.1870861053466797,0.18849563598632812,0.18238019943237305,0.18578314781188965,0.26697397232055664,0.2389545440673828,0.19048738479614258,1.1736516952514648,0.16790246963500977,0.17096614837646484,0.17548680305480957,0.17970061302185059,0.18268132209777832 diff --git a/results/combined/merges_timed/kohsuke/groovy-sandbox.csv b/results/combined/merges_timed/kohsuke/groovy-sandbox.csv index 02b87ccb50..2616a262db 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,Tests_passed,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,True,4,17,138,2,True,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,True,4,True,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,cb31b0652a5429e41ec8866b05c346bb8b81635b1d71891ec60c5f52755f5691,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,1902c6616fe4a2643c5c4afd09be6adb3204bb6ab005a4a666e555f5288ff311,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,e9cb6e0ce2a7934cb53804c9077da521c6a05f936f9001ab56504a1c5c3a65aa,Tests_failed,4c61f3057a7e52a11da1e3d613e7392ce67ac51c30c4b95fb8d50851136aa8a2,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,0.010083198547363281,0.010113239288330078,0.01108694076538086,0.0169830322265625,0.01047062873840332,0.01032257080078125,0.0107879638671875,0.03603506088256836,0.06712484359741211,1.4739878177642822,0.5356340408325195,0.04463958740234375,0.044515132904052734,0.04471564292907715,0.05825090408325195,0.05836820602416992 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,Tests_passed,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,True,4,17,138,2,True,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,True,4,True,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,cb31b0652a5429e41ec8866b05c346bb8b81635b1d71891ec60c5f52755f5691,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,1902c6616fe4a2643c5c4afd09be6adb3204bb6ab005a4a666e555f5288ff311,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,e9cb6e0ce2a7934cb53804c9077da521c6a05f936f9001ab56504a1c5c3a65aa,Tests_failed,4c61f3057a7e52a11da1e3d613e7392ce67ac51c30c4b95fb8d50851136aa8a2,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,0.010083198547363281,0.010113239288330078,0.01108694076538086,0.0169830322265625,0.01047062873840332,0.01032257080078125,0.0107879638671875,0.03603506088256836,0.06712484359741211,1.4739878177642822,0.5356340408325195,0.04463958740234375,0.044515132904052734,0.04471564292907715,0.05825090408325195,0.05836820602416992,0.056467294692993164,0.057370662689208984,0.0574953556060791,0.05634117126464844,0.05550432205200195,0.05565047264099121,0.05516815185546875,0.08842897415161133,0.09106564521789551,1.607262372970581,0.6194586753845215,0.059112548828125,0.05682229995727539,0.055371999740600586,0.058945655822753906,0.055687904357910156 diff --git a/results/combined/merges_timed/kohsuke/libpam4j.csv b/results/combined/merges_timed/kohsuke/libpam4j.csv index ce545b1298..3fa0d7b218 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,True,True,Tests_passed,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,True,10,23,114,3,True,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,True,10,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,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,Merge_failed,79e84cbd35863efb185a4330c0468f61bcb86dcbdbb20135c8cb0496503dc68b,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,55229cd04fdcf23df005f21a83dff67edc949021392dc611bca6143a610ef2c7,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,7b389cce73216abe33bae6e1380fa7c3ea933ac4c9db7f8bf4c48fbd6a6a2ddb,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,0.03841137886047363,0.04195261001586914,0.036437273025512695,0.013512372970581055,0.038878679275512695,0.04119539260864258,0.035227298736572266,0.2265949249267578,0.1753983497619629,0.6626889705657959,0.294339656829834,0.051592350006103516,0.052251338958740234,0.04961991310119629,0.05233263969421387,0.05342721939086914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,True,True,Tests_passed,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,True,10,23,114,3,True,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,True,10,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,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,Merge_failed,79e84cbd35863efb185a4330c0468f61bcb86dcbdbb20135c8cb0496503dc68b,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,55229cd04fdcf23df005f21a83dff67edc949021392dc611bca6143a610ef2c7,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,7b389cce73216abe33bae6e1380fa7c3ea933ac4c9db7f8bf4c48fbd6a6a2ddb,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,0.03841137886047363,0.04195261001586914,0.036437273025512695,0.013512372970581055,0.038878679275512695,0.04119539260864258,0.035227298736572266,0.2265949249267578,0.1753983497619629,0.6626889705657959,0.294339656829834,0.051592350006103516,0.052251338958740234,0.04961991310119629,0.05233263969421387,0.05342721939086914,0.049907684326171875,0.05060982704162598,0.0504302978515625,0.04959559440612793,0.050305843353271484,0.04910683631896973,0.050786495208740234,0.09528493881225586,0.12071347236633301,0.7100892066955566,0.353391170501709,0.050980329513549805,0.05117082595825195,0.05136609077453613,0.05096793174743652,0.05120205879211426 diff --git a/results/combined/merges_timed/kohsuke/winp.csv b/results/combined/merges_timed/kohsuke/winp.csv index 3908fb4782..704c33c103 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,Tests_passed,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,True,9.0,23,102.0,4,True,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,True,9,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,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,0f8a246197105a6e020b72e80ea4054df6392c2d91f9a1c5c754eb1b1e790223,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,0.04798579216003418,0.049063682556152344,0.04556083679199219,0.018724441528320312,0.042247772216796875,0.04674720764160156,0.044332265853881836,0.29398608207702637,0.2271261215209961,1.5001187324523926,0.3368387222290039,0.0359959602355957,0.1025545597076416,0.03642606735229492,0.10338687896728516,0.10373210906982422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,Tests_passed,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,True,9.0,23,102.0,4,True,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,True,9,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,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,0f8a246197105a6e020b72e80ea4054df6392c2d91f9a1c5c754eb1b1e790223,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,af4b1b1beeb72d14534ca18c72c35a77013552147899323a427fde4ed85d593b,Tests_passed,a89964e1f154726dd7598db38fb9b3ab10162a4aa32590ac7f3b4faa7ae07751,0.04798579216003418,0.049063682556152344,0.04556083679199219,0.018724441528320312,0.042247772216796875,0.04674720764160156,0.044332265853881836,0.29398608207702637,0.2271261215209961,1.5001187324523926,0.3368387222290039,0.0359959602355957,0.1025545597076416,0.03642606735229492,0.10338687896728516,0.10373210906982422,0.09637165069580078,0.09972882270812988,0.0984499454498291,0.09850478172302246,0.10126471519470215,0.10029244422912598,0.09881091117858887,0.16663694381713867,0.17434287071228027,1.58294677734375,0.3738279342651367,0.10050415992736816,0.1007223129272461,0.09691286087036133,0.10062694549560547,0.10106062889099121 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 6930064370..aab42e0702 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,True,16,36,346,6,True,16,Tests_passed,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,True,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,True,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,30dfdd0e4dd032b1b2b0d5e1c8b3c806f58e9b6aee223f7206c1153f82313721,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,Merge_failed,a0fa86b08b89c5109aed8d65d2ff4a0054b69a62699b054844b77b38f42b2324,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ed29f4cd6f768cfa9bc02c4f9b97c9d1cfa96128733f8e624d3425a0a9f879b0,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,779819621cac1ced045fd3f5c41d0fd08fe37af6e72bee8320ce66b893ec295f,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,0.036749839782714844,0.03270149230957031,0.03316831588745117,0.016794204711914062,0.039559125900268555,0.027948617935180664,0.03374981880187988,0.309201717376709,0.2893192768096924,0.5068464279174805,0.21179795265197754,0.0835261344909668,0.07930660247802734,0.08051013946533203,0.09291744232177734,0.08840274810791016 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,True,16,36,346,6,True,16,Tests_passed,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,True,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,True,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,30dfdd0e4dd032b1b2b0d5e1c8b3c806f58e9b6aee223f7206c1153f82313721,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,Merge_failed,a0fa86b08b89c5109aed8d65d2ff4a0054b69a62699b054844b77b38f42b2324,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ed29f4cd6f768cfa9bc02c4f9b97c9d1cfa96128733f8e624d3425a0a9f879b0,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,779819621cac1ced045fd3f5c41d0fd08fe37af6e72bee8320ce66b893ec295f,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,0.036749839782714844,0.03270149230957031,0.03316831588745117,0.016794204711914062,0.039559125900268555,0.027948617935180664,0.03374981880187988,0.309201717376709,0.2893192768096924,0.5068464279174805,0.21179795265197754,0.0835261344909668,0.07930660247802734,0.08051013946533203,0.09291744232177734,0.08840274810791016,0.08697962760925293,0.0861349105834961,0.08623600006103516,0.08478307723999023,0.08568549156188965,0.08476138114929199,0.0854806900024414,0.17739582061767578,0.20778608322143555,0.5407822132110596,0.29791855812072754,0.08691906929016113,0.08793163299560547,0.08964371681213379,0.08745121955871582,0.08436107635498047 diff --git a/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv b/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv index 4ee166074c..4c8111de38 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,True,7,26,140,2,True,7,Tests_passed,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,True,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,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,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,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,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,249c647b75c13aea585ba2631bc3a5d5c1276f9088e7fbe48e7d1f2f15165f9d,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,0.04315304756164551,0.04300189018249512,0.04588913917541504,0.014758110046386719,0.04311037063598633,0.03789401054382324,0.043642520904541016,0.1701362133026123,0.11525964736938477,0.9798083305358887,0.37235355377197266,0.03040027618408203,0.05559206008911133,0.03011178970336914,0.05515146255493164,0.05410265922546387 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,True,7,26,140,2,True,7,Tests_passed,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,True,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,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,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,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,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,249c647b75c13aea585ba2631bc3a5d5c1276f9088e7fbe48e7d1f2f15165f9d,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,0.04315304756164551,0.04300189018249512,0.04588913917541504,0.014758110046386719,0.04311037063598633,0.03789401054382324,0.043642520904541016,0.1701362133026123,0.11525964736938477,0.9798083305358887,0.37235355377197266,0.03040027618408203,0.05559206008911133,0.03011178970336914,0.05515146255493164,0.05410265922546387,0.05541062355041504,0.05484938621520996,0.05459403991699219,0.05368399620056152,0.05497002601623535,0.055190324783325195,0.05578780174255371,0.08637380599975586,0.08704876899719238,1.1128568649291992,0.44168734550476074,0.054937124252319336,0.055170297622680664,0.05440044403076172,0.0533137321472168,0.05397748947143555 diff --git a/results/combined/merges_timed/komoot/photon.csv b/results/combined/merges_timed/komoot/photon.csv index 917b2c7ebe..da3626c015 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,Tests_passed,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,True,6,19,128,2,True,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,True,6,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,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,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,71885bc18a33ae3323d00c981f1a8b0b919585c284e3bd5cb764b3e32900c25e,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,0.03969693183898926,0.044770002365112305,0.04146122932434082,0.026195049285888672,0.04219794273376465,0.0485837459564209,0.031783342361450195,0.17185330390930176,0.12437248229980469,0.961965799331665,0.3727238178253174,0.036951541900634766,0.0593867301940918,0.05500149726867676,0.059712886810302734,0.08011341094970703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,Tests_passed,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,True,6,19,128,2,True,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,True,6,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,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,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,71885bc18a33ae3323d00c981f1a8b0b919585c284e3bd5cb764b3e32900c25e,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,0.03969693183898926,0.044770002365112305,0.04146122932434082,0.026195049285888672,0.04219794273376465,0.0485837459564209,0.031783342361450195,0.17185330390930176,0.12437248229980469,0.961965799331665,0.3727238178253174,0.036951541900634766,0.0593867301940918,0.05500149726867676,0.059712886810302734,0.08011341094970703,0.059223175048828125,0.06919264793395996,0.05910754203796387,0.07614398002624512,0.060411691665649414,0.05912518501281738,0.060422420501708984,0.09219837188720703,0.09059453010559082,1.0108959674835205,0.42299556732177734,0.05684685707092285,0.07339072227478027,0.05788397789001465,0.05950736999511719,0.05908775329589844 diff --git a/results/combined/merges_timed/kong/unirest-java.csv b/results/combined/merges_timed/kong/unirest-java.csv index 3f576caf5c..fd8df63759 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,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,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,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,db500a00092ada6b9c970afed19abcbc3853fba79ce1a1d988c394d134634d2e,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.016065597534179688,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.10572075843811035,1.1297626495361328,0.4058341979980469,0.032629966735839844,0.05713248252868652,0.03291463851928711,0.05854201316833496,0.05887317657470703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,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,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,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,db500a00092ada6b9c970afed19abcbc3853fba79ce1a1d988c394d134634d2e,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.016065597534179688,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.10572075843811035,1.1297626495361328,0.4058341979980469,0.032629966735839844,0.05713248252868652,0.03291463851928711,0.05854201316833496,0.05887317657470703,0.05468463897705078,0.05581331253051758,0.05386209487915039,0.05671095848083496,0.05649089813232422,0.05584216117858887,0.05615973472595215,0.08591651916503906,0.08841228485107422,1.1028168201446533,0.4150221347808838,0.054215431213378906,0.05788230895996094,0.05504322052001953,0.05586099624633789,0.05596208572387695 diff --git a/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv b/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv index 8be9d8ca12..d65870fdb6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,abb6c10117c59ea83b2d7849e8eb5fb70911becf,1958cf3cf1e2a3ec66ba20305e0e4104c4cf2ed6,d1ab7fd4787d13f546875df05ec4d9e7ab1bfc2f,,True,True,True,10,28,456,2,True,10,Tests_passed,277a17114171978f1a320623f6fd11f93433e465639c009256f8bcd2bc207dbf,True,Tests_passed,bc87f38447c5ac7d8a1b2673da5123c919300a888d349dae986ed9ffbfbda660,True,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,50cbe12da9dfe96f2069f4836a7ea7ad1e3362eb915615f14fdb6d2d8d9ac7f4,Tests_failed,61b0bd4017880910c27a740014998e2d58d5955de023156b2970106822b2f054,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,87a0cd4e9ee3718ca9c758db8c390c26a2b05a80ad5e7b610ee91c4cbb1baac7,Tests_failed,61b0bd4017880910c27a740014998e2d58d5955de023156b2970106822b2f054,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,0.02168440818786621,0.0191957950592041,0.024072647094726562,0.027998685836791992,0.0278167724609375,0.024244308471679688,0.024448394775390625,0.06445980072021484,0.08956003189086914,0.8517715930938721,0.3888216018676758,0.03309941291809082,0.07531023025512695,0.04814028739929199,0.07543802261352539,0.07731890678405762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,abb6c10117c59ea83b2d7849e8eb5fb70911becf,1958cf3cf1e2a3ec66ba20305e0e4104c4cf2ed6,d1ab7fd4787d13f546875df05ec4d9e7ab1bfc2f,,True,True,True,10,28,456,2,True,10,Tests_passed,277a17114171978f1a320623f6fd11f93433e465639c009256f8bcd2bc207dbf,True,Tests_passed,bc87f38447c5ac7d8a1b2673da5123c919300a888d349dae986ed9ffbfbda660,True,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,50cbe12da9dfe96f2069f4836a7ea7ad1e3362eb915615f14fdb6d2d8d9ac7f4,Tests_failed,61b0bd4017880910c27a740014998e2d58d5955de023156b2970106822b2f054,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,87a0cd4e9ee3718ca9c758db8c390c26a2b05a80ad5e7b610ee91c4cbb1baac7,Tests_failed,61b0bd4017880910c27a740014998e2d58d5955de023156b2970106822b2f054,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,0.02168440818786621,0.0191957950592041,0.024072647094726562,0.027998685836791992,0.0278167724609375,0.024244308471679688,0.024448394775390625,0.06445980072021484,0.08956003189086914,0.8517715930938721,0.3888216018676758,0.03309941291809082,0.07531023025512695,0.04814028739929199,0.07543802261352539,0.07731890678405762,0.07100963592529297,0.07346463203430176,0.07580399513244629,0.0565950870513916,0.0737144947052002,0.07089900970458984,0.07833600044250488,0.11515259742736816,0.10571956634521484,0.940302848815918,0.4227466583251953,0.07418012619018555,0.0740814208984375,0.05594325065612793,0.07042932510375977,0.07378268241882324 diff --git a/results/combined/merges_timed/konloch/bytecode-viewer.csv b/results/combined/merges_timed/konloch/bytecode-viewer.csv index 08679f642d..5cff27a26d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,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,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,9cc310c7405919827b434123fc421076ef42621ea746fdb657dbb5a1cdb4a533,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.10188603401184082,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.14069533348083496,1.034867286682129,0.8988618850708008,0.10292959213256836,0.16390657424926758,0.10017561912536621,0.15583467483520508,0.1581404209136963 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,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,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,9cc310c7405919827b434123fc421076ef42621ea746fdb657dbb5a1cdb4a533,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,Tests_passed,2fd25c7176c190e0c5e6c11334d456f5437c7f8abe0838bdeb3c41e70a06af90,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.10188603401184082,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.14069533348083496,1.034867286682129,0.8988618850708008,0.10292959213256836,0.16390657424926758,0.10017561912536621,0.15583467483520508,0.1581404209136963,0.16192412376403809,0.15577340126037598,0.19375181198120117,0.19244718551635742,0.2276155948638916,0.19313478469848633,0.2048182487487793,0.21856403350830078,0.20579123497009277,1.3914415836334229,0.9793388843536377,0.157944917678833,0.20435667037963867,0.15671205520629883,0.15290093421936035,0.20811080932617188 diff --git a/results/combined/merges_timed/koraktor/mavanagaiata.csv b/results/combined/merges_timed/koraktor/mavanagaiata.csv index 0c107c1f89..00f3c3087c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,True,11,45,215,4,True,11,Tests_passed,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,True,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,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,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,c75be4babd734fc91b9518de2c226dbe0ab29bd7c6e69800a86c0735dda259b2,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,0dc91c2425e242084d6ae09e3eb5c3a77affe6590193f3c996c57e30fb9c569e,Tests_failed,8e471bcb72b44ece33d8b681079990f869cb9e6aa876bbb556f454cbf504a0e0,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,0.04230332374572754,0.04645514488220215,0.043282270431518555,0.01601409912109375,0.04003119468688965,0.042981863021850586,0.04601168632507324,0.30267786979675293,0.22935795783996582,2.206728219985962,0.47675466537475586,0.04338192939758301,0.08222675323486328,0.042922258377075195,0.08500313758850098,0.0861043930053711 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,True,11,45,215,4,True,11,Tests_passed,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,True,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,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,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,c75be4babd734fc91b9518de2c226dbe0ab29bd7c6e69800a86c0735dda259b2,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,0dc91c2425e242084d6ae09e3eb5c3a77affe6590193f3c996c57e30fb9c569e,Tests_failed,8e471bcb72b44ece33d8b681079990f869cb9e6aa876bbb556f454cbf504a0e0,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,0.04230332374572754,0.04645514488220215,0.043282270431518555,0.01601409912109375,0.04003119468688965,0.042981863021850586,0.04601168632507324,0.30267786979675293,0.22935795783996582,2.206728219985962,0.47675466537475586,0.04338192939758301,0.08222675323486328,0.042922258377075195,0.08500313758850098,0.0861043930053711,0.08236217498779297,0.07960104942321777,0.07946395874023438,0.0795280933380127,0.07939386367797852,0.08108401298522949,0.08027434349060059,0.14449095726013184,0.15793251991271973,2.223151445388794,0.5836713314056396,0.08066558837890625,0.0794973373413086,0.0811605453491211,0.0814356803894043,0.08764028549194336 diff --git a/results/combined/merges_timed/koraktor/steam-condenser-java.csv b/results/combined/merges_timed/koraktor/steam-condenser-java.csv index 06740f0d65..31b5a2496c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,Tests_passed,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,True,26,89,1344,3,True,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,True,26,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,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Tests_failed,a57d83c35ec2218c81bcbeb33bd3d1aae8acbef309da4f528d68ed7e105fa8d9,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,01a63f86144495462010d478c7044444c518bf451f9330c656388385060b5b7e,Tests_failed,a79cf407cf4edbda155e89939de2ab2d564c79f518fccc69dcb65aa81cbc6d2a,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,0.03427696228027344,0.04236006736755371,0.04978036880493164,0.026233911514282227,0.048789024353027344,0.04136252403259277,0.06044602394104004,0.23542380332946777,0.16191315650939941,1.1355955600738525,0.5214192867279053,0.05569720268249512,0.09853172302246094,0.060138702392578125,0.08364343643188477,0.0980527400970459 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,Tests_passed,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,True,26,89,1344,3,True,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,True,26,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,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Tests_failed,a57d83c35ec2218c81bcbeb33bd3d1aae8acbef309da4f528d68ed7e105fa8d9,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,01a63f86144495462010d478c7044444c518bf451f9330c656388385060b5b7e,Tests_failed,a79cf407cf4edbda155e89939de2ab2d564c79f518fccc69dcb65aa81cbc6d2a,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,5088a9ca16388cb5d6a4d15bf3f3ae5ebca348195433aff6c08923c872166b41,Tests_passed,835edd6452b9e6ba3df6795ba15aa555f7e7cceeaa9e48948d6c4105f8ba2aeb,0.03427696228027344,0.04236006736755371,0.04978036880493164,0.026233911514282227,0.048789024353027344,0.04136252403259277,0.06044602394104004,0.23542380332946777,0.16191315650939941,1.1355955600738525,0.5214192867279053,0.05569720268249512,0.09853172302246094,0.060138702392578125,0.08364343643188477,0.0980527400970459,0.09249019622802734,0.07980608940124512,0.09539961814880371,0.0965108871459961,0.09410214424133301,0.09269547462463379,0.09869885444641113,0.1425609588623047,0.15224361419677734,1.1610565185546875,0.6113414764404297,0.0932760238647461,0.09359979629516602,0.09530234336853027,0.09197568893432617,0.09479331970214844 diff --git a/results/combined/merges_timed/kpelykh/docker-java.csv b/results/combined/merges_timed/kpelykh/docker-java.csv index b7369334a9..6e4ba53fd2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,12.0,49,346.0,2,True,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,True,12,True,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,5ae1006a8900bec815c112e6beeaa94c4478d75dec6dd5872cecce159e6daeb4,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,795fc982cfd341aae99f0b82eab24eb1cfca70cad931b99d39169157725e0e24,Tests_failed,045a7ae81802bb9da034ae8f838f402f3e60f5c2ae546ac5467ce1f7d9ccbdd9,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,0.009765386581420898,0.009929418563842773,0.010329008102416992,0.01565694808959961,0.00985574722290039,0.00986170768737793,0.009916543960571289,0.03456592559814453,0.06860971450805664,1.3784468173980713,0.5393168926239014,0.04327869415283203,0.06275439262390137,0.04523038864135742,0.06285452842712402,0.0627143383026123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,12.0,49,346.0,2,True,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,True,12,True,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,5ae1006a8900bec815c112e6beeaa94c4478d75dec6dd5872cecce159e6daeb4,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,795fc982cfd341aae99f0b82eab24eb1cfca70cad931b99d39169157725e0e24,Tests_failed,045a7ae81802bb9da034ae8f838f402f3e60f5c2ae546ac5467ce1f7d9ccbdd9,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,cff99d9adfc56d39cec1aa277bb8038c374a233673bb7060c5f27b2846f60b3a,Tests_passed,7491407698d0856e45dc349d2a554efc70962d09435f8ed0e8c210399c8ef2d1,0.009765386581420898,0.009929418563842773,0.010329008102416992,0.01565694808959961,0.00985574722290039,0.00986170768737793,0.009916543960571289,0.03456592559814453,0.06860971450805664,1.3784468173980713,0.5393168926239014,0.04327869415283203,0.06275439262390137,0.04523038864135742,0.06285452842712402,0.0627143383026123,0.05915713310241699,0.059186458587646484,0.06128215789794922,0.06251120567321777,0.05994987487792969,0.059180259704589844,0.05921030044555664,0.09127211570739746,0.09495162963867188,1.5202407836914062,0.5996639728546143,0.05941486358642578,0.05982398986816406,0.06148242950439453,0.06101036071777344,0.06133270263671875 diff --git a/results/combined/merges_timed/krilivye/jocco.csv b/results/combined/merges_timed/krilivye/jocco.csv index a1ae612379..ac50d919b0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,True,True,Tests_passed,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,True,5,24,71,3,True,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,True,6,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,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,ae98afcea8752cecdc9b2a29584fad6009278629fc1374c1c5da512528130c0f,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,c2b9735d678528040fb05dafa0537b767663b7a237d8f20b5c6e848f7c07b931,Tests_failed,7da534a3ab97237c9b5cbd520ee3db1210e7802361516da97dd05f81fb1a4fd3,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,0.044194698333740234,0.03874039649963379,0.03793692588806152,0.014297723770141602,0.04479837417602539,0.03694295883178711,0.043160438537597656,0.14337539672851562,0.12082862854003906,0.7116079330444336,0.2922368049621582,0.042226314544677734,0.04247260093688965,0.04153275489807129,0.04352903366088867,0.04274940490722656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,True,True,Tests_passed,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,True,5,24,71,3,True,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,True,6,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,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,ae98afcea8752cecdc9b2a29584fad6009278629fc1374c1c5da512528130c0f,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,c2b9735d678528040fb05dafa0537b767663b7a237d8f20b5c6e848f7c07b931,Tests_failed,7da534a3ab97237c9b5cbd520ee3db1210e7802361516da97dd05f81fb1a4fd3,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,0.044194698333740234,0.03874039649963379,0.03793692588806152,0.014297723770141602,0.04479837417602539,0.03694295883178711,0.043160438537597656,0.14337539672851562,0.12082862854003906,0.7116079330444336,0.2922368049621582,0.042226314544677734,0.04247260093688965,0.04153275489807129,0.04352903366088867,0.04274940490722656,0.041600942611694336,0.0407404899597168,0.0424346923828125,0.04081845283508301,0.04146242141723633,0.04272198677062988,0.04268336296081543,0.0746145248413086,0.08101129531860352,0.7315244674682617,0.3377063274383545,0.041265249252319336,0.04271411895751953,0.04217267036437988,0.0427858829498291,0.04184269905090332 diff --git a/results/combined/merges_timed/kroimon/bukkit-alphachest.csv b/results/combined/merges_timed/kroimon/bukkit-alphachest.csv index 98f04ca1ea..7ff2b599b1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,False,True,2,1,2,10,True,10,Tests_passed,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,True,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,True,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,f0cd2f6f73fb9713e884714accf96c7d669cccb2754cf4d9189fafdfeb721868,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,abd990cb6d85365b0521d773bbb0c71e79efd852a0aec59227134a246bd74f22,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,0.03632855415344238,0.036281585693359375,0.03887033462524414,0.01190495491027832,0.03792929649353027,0.03360795974731445,0.008396387100219727,0.15924739837646484,0.10961008071899414,0.6278622150421143,0.43663763999938965,0.037966251373291016,0.04018402099609375,0.03847956657409668,0.040548086166381836,0.04090547561645508 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,False,True,2,1,2,10,True,10,Tests_passed,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,True,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,True,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,f0cd2f6f73fb9713e884714accf96c7d669cccb2754cf4d9189fafdfeb721868,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,abd990cb6d85365b0521d773bbb0c71e79efd852a0aec59227134a246bd74f22,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,0.03632855415344238,0.036281585693359375,0.03887033462524414,0.01190495491027832,0.03792929649353027,0.03360795974731445,0.008396387100219727,0.15924739837646484,0.10961008071899414,0.6278622150421143,0.43663763999938965,0.037966251373291016,0.04018402099609375,0.03847956657409668,0.040548086166381836,0.04090547561645508,0.03812766075134277,0.03835034370422363,0.038686513900756836,0.038468122482299805,0.037522077560424805,0.038904428482055664,0.0380709171295166,0.0688638687133789,0.07370495796203613,0.6330928802490234,0.4797945022583008,0.03893733024597168,0.03883218765258789,0.038484811782836914,0.03738999366760254,0.03939056396484375 diff --git a/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv b/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv index 4e183bf05f..301fa78131 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,True,True,Tests_passed,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,True,13,54,784,2,True,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,True,13,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,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,be045872f884f1d49b728a4bbe986b3bae3fad08d592dc9310b25671bb7b391d,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,039ce1701c58ce3c356c3864ec26f56eacb13b3a2937bb73ee23ac1e79b55f89,Tests_failed,2bd2ce1bc87e489f8622d3bba4d626a347c3b5fe8b4736ff9569d9aa295f39ac,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,0.008119821548461914,0.00794363021850586,0.007814884185791016,0.013000726699829102,0.0077211856842041016,0.0075681209564208984,0.00789189338684082,0.03163576126098633,0.06493091583251953,0.6726126670837402,0.45885562896728516,0.037752628326416016,0.03985333442687988,0.03783392906188965,0.03922700881958008,0.03931999206542969 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,True,True,Tests_passed,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,True,13,54,784,2,True,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,True,13,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,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,be045872f884f1d49b728a4bbe986b3bae3fad08d592dc9310b25671bb7b391d,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,039ce1701c58ce3c356c3864ec26f56eacb13b3a2937bb73ee23ac1e79b55f89,Tests_failed,2bd2ce1bc87e489f8622d3bba4d626a347c3b5fe8b4736ff9569d9aa295f39ac,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,0.008119821548461914,0.00794363021850586,0.007814884185791016,0.013000726699829102,0.0077211856842041016,0.0075681209564208984,0.00789189338684082,0.03163576126098633,0.06493091583251953,0.6726126670837402,0.45885562896728516,0.037752628326416016,0.03985333442687988,0.03783392906188965,0.03922700881958008,0.03931999206542969,0.04044675827026367,0.04007148742675781,0.03934216499328613,0.03973960876464844,0.03885078430175781,0.03939032554626465,0.03926444053649902,0.07085013389587402,0.07428932189941406,0.7633113861083984,0.5266165733337402,0.03983902931213379,0.04016280174255371,0.040479421615600586,0.03934597969055176,0.03986525535583496 diff --git a/results/combined/merges_timed/kstyrc/embedded-redis.csv b/results/combined/merges_timed/kstyrc/embedded-redis.csv index cabbb916b5..2a255015fa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,False,True,4,5,29,2,True,4,Tests_passed,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,True,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,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,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,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,9b99f9338d12f085b8a68000604270b685cc47223dac061ce516b94dfdcb7e09,Tests_failed,85f7f7c15ce1ea1226af3e8d4ca91e5c393eee3f218e1095c18635d56d0f755c,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,0.05459928512573242,0.055043697357177734,0.0786890983581543,0.09770894050598145,0.07903099060058594,0.07799029350280762,0.07839345932006836,0.12685441970825195,0.11151480674743652,0.6164476871490479,0.29617953300476074,0.14135956764221191,0.15308690071105957,0.13941168785095215,0.1676928997039795,0.16259455680847168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,False,True,4,5,29,2,True,4,Tests_passed,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,True,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,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,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,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,9b99f9338d12f085b8a68000604270b685cc47223dac061ce516b94dfdcb7e09,Tests_failed,85f7f7c15ce1ea1226af3e8d4ca91e5c393eee3f218e1095c18635d56d0f755c,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,0.05459928512573242,0.055043697357177734,0.0786890983581543,0.09770894050598145,0.07903099060058594,0.07799029350280762,0.07839345932006836,0.12685441970825195,0.11151480674743652,0.6164476871490479,0.29617953300476074,0.14135956764221191,0.15308690071105957,0.13941168785095215,0.1676928997039795,0.16259455680847168,0.1614856719970703,0.15801739692687988,0.1874840259552002,0.1890583038330078,0.18435025215148926,0.176771879196167,0.18008708953857422,0.24396824836730957,0.2104017734527588,0.7578303813934326,0.31081151962280273,0.15816926956176758,0.16297674179077148,0.15847229957580566,0.1541590690612793,0.1571485996246338 diff --git a/results/combined/merges_timed/kungfoo/geohash-java.csv b/results/combined/merges_timed/kungfoo/geohash-java.csv index e50a01dacc..43e20d125a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,True,5,19,77,3,True,5,Tests_passed,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,True,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,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,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Tests_failed,c3d3fa98a454a374a6288d6e326c7cbefcbf5421d68b8be21cc0a5660a8af9fc,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,fb076185fb8120e08e459050ca3098c67a9480b9d9c2688a43791f591b57c00f,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,30de905fae554b5b8b06c21972268037091eac95767c842a43f0ee6611d539b5,Tests_failed,d1a35f4b95fac76bee6744bd79db94a072f406c63c13dd9b28587ecb31825c8d,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,0.04041004180908203,0.03872227668762207,0.03928565979003906,0.01520395278930664,0.04120993614196777,0.0361475944519043,0.032424211502075195,0.21016883850097656,0.17875409126281738,2.020763635635376,0.38866186141967773,0.04591059684753418,0.06281399726867676,0.04018425941467285,0.06300187110900879,0.06404924392700195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,True,5,19,77,3,True,5,Tests_passed,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,True,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,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,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Tests_failed,c3d3fa98a454a374a6288d6e326c7cbefcbf5421d68b8be21cc0a5660a8af9fc,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,fb076185fb8120e08e459050ca3098c67a9480b9d9c2688a43791f591b57c00f,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,30de905fae554b5b8b06c21972268037091eac95767c842a43f0ee6611d539b5,Tests_failed,d1a35f4b95fac76bee6744bd79db94a072f406c63c13dd9b28587ecb31825c8d,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,0.04041004180908203,0.03872227668762207,0.03928565979003906,0.01520395278930664,0.04120993614196777,0.0361475944519043,0.032424211502075195,0.21016883850097656,0.17875409126281738,2.020763635635376,0.38866186141967773,0.04591059684753418,0.06281399726867676,0.04018425941467285,0.06300187110900879,0.06404924392700195,0.06170940399169922,0.061026573181152344,0.06190228462219238,0.06158018112182617,0.06015896797180176,0.06131434440612793,0.06033682823181152,0.10717463493347168,0.13476991653442383,2.014500141143799,0.44353246688842773,0.06247854232788086,0.06138300895690918,0.0609281063079834,0.062227487564086914,0.060629844665527344 diff --git a/results/combined/merges_timed/kurbatov/firmata4j.csv b/results/combined/merges_timed/kurbatov/firmata4j.csv index 062ae1c6e4..2f20033a24 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,True,5,12,71,2,True,5,Tests_passed,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,True,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,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,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,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,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,c4f4051c6264cb7ff8a5e4f27855adbb33753fb11d5cb86b49380a02c2f83cf7,Tests_failed,4258f65671f04f2a123b92c8e2f44d0121ecf674baefcf868ac8de888e1bb249,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,0.043005943298339844,0.04506993293762207,0.013389348983764648,0.01726841926574707,0.0523984432220459,0.011439800262451172,0.03736376762390137,0.04983234405517578,0.09946441650390625,1.0930955410003662,0.35974550247192383,0.03367304801940918,0.058924198150634766,0.03385043144226074,0.058854103088378906,0.059237003326416016 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,True,5,12,71,2,True,5,Tests_passed,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,True,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,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,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,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,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,c4f4051c6264cb7ff8a5e4f27855adbb33753fb11d5cb86b49380a02c2f83cf7,Tests_failed,4258f65671f04f2a123b92c8e2f44d0121ecf674baefcf868ac8de888e1bb249,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,0.043005943298339844,0.04506993293762207,0.013389348983764648,0.01726841926574707,0.0523984432220459,0.011439800262451172,0.03736376762390137,0.04983234405517578,0.09946441650390625,1.0930955410003662,0.35974550247192383,0.03367304801940918,0.058924198150634766,0.03385043144226074,0.058854103088378906,0.059237003326416016,0.0601959228515625,0.060849905014038086,0.06045675277709961,0.06116986274719238,0.06134533882141113,0.062339067459106445,0.06279182434082031,0.09317374229431152,0.0928804874420166,1.219099998474121,0.40903210639953613,0.06173372268676758,0.058696746826171875,0.05975651741027832,0.05926847457885742,0.05882668495178223 diff --git a/results/combined/merges_timed/kvladislav/ticketmanager.csv b/results/combined/merges_timed/kvladislav/ticketmanager.csv index 77b3e930d8..e153ba991a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,True,82,3355,35182,2,True,82,Tests_passed,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,True,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,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,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,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,ce55270b65ff71bb73b06afe7939dec1b8a43d517a5aba8380d28e0a8cecdf0f,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,0.08465003967285156,0.061246633529663086,0.054303646087646484,0.06479096412658691,0.07663774490356445,0.04426455497741699,0.05216169357299805,0.18009352684020996,0.12606573104858398,1.503511667251587,1.8277027606964111,0.13064050674438477,0.1587674617767334,0.07337355613708496,0.15594911575317383,0.15950489044189453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,True,82,3355,35182,2,True,82,Tests_passed,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,True,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,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,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,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,ce55270b65ff71bb73b06afe7939dec1b8a43d517a5aba8380d28e0a8cecdf0f,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,0.08465003967285156,0.061246633529663086,0.054303646087646484,0.06479096412658691,0.07663774490356445,0.04426455497741699,0.05216169357299805,0.18009352684020996,0.12606573104858398,1.503511667251587,1.8277027606964111,0.13064050674438477,0.1587674617767334,0.07337355613708496,0.15594911575317383,0.15950489044189453,0.14832830429077148,0.10119247436523438,0.17140889167785645,0.17247462272644043,0.17349743843078613,0.17162466049194336,0.17615580558776855,0.23147344589233398,0.2172563076019287,1.9127602577209473,1.8978071212768555,0.14940404891967773,0.10607194900512695,0.15129876136779785,0.1527998447418213,0.16344308853149414 diff --git a/results/combined/merges_timed/laforge49/jactor.csv b/results/combined/merges_timed/laforge49/jactor.csv index 8b51bd94e0..fe2c0c08ca 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,True,True,Tests_passed,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,True,8,25,234,2,True,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,True,8,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,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,93ac60bb8262a2040b65e7f28a18901616748024b66cd57749c77a16c09071e4,Tests_failed,4e75493cbaffa75d7c6aa2dfec9362d8aac6e5345e85f14faaeb7f68923f917c,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,0.04442334175109863,0.043888092041015625,0.045567989349365234,0.024013519287109375,0.04208946228027344,0.03536367416381836,0.04481196403503418,0.1636219024658203,0.1097872257232666,0.621612548828125,0.28032422065734863,0.043592214584350586,0.05912160873413086,0.03412270545959473,0.0716404914855957,0.07104992866516113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,True,True,Tests_passed,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,True,8,25,234,2,True,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,True,8,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,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,93ac60bb8262a2040b65e7f28a18901616748024b66cd57749c77a16c09071e4,Tests_failed,4e75493cbaffa75d7c6aa2dfec9362d8aac6e5345e85f14faaeb7f68923f917c,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,a68bfa427e9fdeb22ef8e5b6d1bbae5e4900c0f4116f35a0733bbbb20bea07da,Tests_passed,5f10a4dd59c2ed7074891206be5659ebe20ce779d38ac9e90a406cdea88fd766,0.04442334175109863,0.043888092041015625,0.045567989349365234,0.024013519287109375,0.04208946228027344,0.03536367416381836,0.04481196403503418,0.1636219024658203,0.1097872257232666,0.621612548828125,0.28032422065734863,0.043592214584350586,0.05912160873413086,0.03412270545959473,0.0716404914855957,0.07104992866516113,0.057023048400878906,0.05518007278442383,0.06942534446716309,0.07052826881408691,0.05673933029174805,0.05684256553649902,0.06965255737304688,0.10579109191894531,0.08826994895935059,0.6832516193389893,0.31845593452453613,0.07141518592834473,0.06848001480102539,0.05506610870361328,0.05602097511291504,0.06928229331970215 diff --git a/results/combined/merges_timed/laforge49/jactor2.csv b/results/combined/merges_timed/laforge49/jactor2.csv index 6191af8ae5..3f6bfc02ca 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,True,11,29,314,3,True,11,Tests_passed,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,True,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,True,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,79a5a46da309f0c2302bb4307ad4667339bb35aacd9fa645ba0a011dcb9e591a,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_timedout,,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,5610f7253fa729462c5d89333bc9b4097574165ff952d843a4b646eaec3812ec,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,aa1c726c07fee6c97db65cd11a60ccbe57a138acfb0566e533e1d6b1b0f4f875,Merge_timedout,,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,0.03725004196166992,0.04851984977722168,0.038925886154174805,0.015767812728881836,0.032631635665893555,0.03399348258972168,0.04030346870422363,0.25691699981689453,0.17222166061401367,1.1422743797302246,-1.0,0.041339874267578125,0.06164407730102539,0.0395359992980957,0.06212663650512695,0.0744786262512207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,True,11,29,314,3,True,11,Tests_passed,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,True,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,True,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,79a5a46da309f0c2302bb4307ad4667339bb35aacd9fa645ba0a011dcb9e591a,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_timedout,,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,5610f7253fa729462c5d89333bc9b4097574165ff952d843a4b646eaec3812ec,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,aa1c726c07fee6c97db65cd11a60ccbe57a138acfb0566e533e1d6b1b0f4f875,Merge_timedout,,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,0.03725004196166992,0.04851984977722168,0.038925886154174805,0.015767812728881836,0.032631635665893555,0.03399348258972168,0.04030346870422363,0.25691699981689453,0.17222166061401367,1.1422743797302246,-1.0,0.041339874267578125,0.06164407730102539,0.0395359992980957,0.06212663650512695,0.0744786262512207,0.05936002731323242,0.06854128837585449,0.05990910530090332,0.07089948654174805,0.05969071388244629,0.05887722969055176,0.05821824073791504,0.10692882537841797,0.11831116676330566,1.2103025913238525,-1.0,0.058983564376831055,0.05980396270751953,0.05920219421386719,0.059534311294555664,0.06839394569396973 diff --git a/results/combined/merges_timed/larsga/duke.csv b/results/combined/merges_timed/larsga/duke.csv index 609d0471b2..98693f7ca1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,True,True,Tests_passed,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,True,16,55,299,2,True,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,True,16,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,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,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,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,7fc81f4003f2ecfea51875ed2d781b6e24bf5c56c26950c405a420f857d4378a,Tests_failed,865fc53be214661e649053dc0cc830cd72aa09743d8ba283d2cd29d7ea6d06d5,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,0.04549241065979004,0.04026079177856445,0.046247243881225586,0.0897221565246582,0.01846456527709961,0.04452395439147949,0.04460310935974121,0.17837119102478027,0.1130075454711914,0.6915702819824219,0.541269063949585,0.033666372299194336,0.15488982200622559,0.13671088218688965,0.058469295501708984,0.08036494255065918 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,True,True,Tests_passed,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,True,16,55,299,2,True,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,True,16,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,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,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,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,7fc81f4003f2ecfea51875ed2d781b6e24bf5c56c26950c405a420f857d4378a,Tests_failed,865fc53be214661e649053dc0cc830cd72aa09743d8ba283d2cd29d7ea6d06d5,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,0.04549241065979004,0.04026079177856445,0.046247243881225586,0.0897221565246582,0.01846456527709961,0.04452395439147949,0.04460310935974121,0.17837119102478027,0.1130075454711914,0.6915702819824219,0.541269063949585,0.033666372299194336,0.15488982200622559,0.13671088218688965,0.058469295501708984,0.08036494255065918,0.05839276313781738,0.14931797981262207,0.17081785202026367,0.1796879768371582,0.05825543403625488,0.0771780014038086,0.17367959022521973,0.2382042407989502,0.20020246505737305,0.8609051704406738,0.6284739971160889,0.1392955780029297,0.16378092765808105,0.1505134105682373,0.056627511978149414,0.14569568634033203 diff --git a/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv b/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv index 1aa1b59751..88d9d0c90e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,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,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,9577a4032651594c4750270bbb2def24f11d875b0a2f172330aefeecc7942abf,Merge_failed,c0ad3881f0402eba31efbb062854847f9a896767cfc6e906ad81b97789a8eb08,Merge_failed,934a2870265e4a293352a939c0ce76589ad7e068b813a3838bfa1976ab3fb7e5,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,0.04962968826293945,0.03596329689025879,0.04900050163269043,0.016381502151489258,0.03921031951904297,0.040515899658203125,0.04734969139099121,0.4349236488342285,0.35172319412231445,3.3680779933929443,0.595412015914917,0.054201364517211914,0.11762547492980957,0.05586671829223633,0.11652541160583496,0.1246945858001709 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,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,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,9577a4032651594c4750270bbb2def24f11d875b0a2f172330aefeecc7942abf,Merge_failed,c0ad3881f0402eba31efbb062854847f9a896767cfc6e906ad81b97789a8eb08,Merge_failed,934a2870265e4a293352a939c0ce76589ad7e068b813a3838bfa1976ab3fb7e5,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,cefc52b616b433d48fc332682f4785e5083f2b41fb822145aac8616e89445dbc,Merge_failed,2a08e451bd0b39447d091cdb51fc7ea3ab5c5d9f4d0e7828d9c991c1c01a85ae,0.04962968826293945,0.03596329689025879,0.04900050163269043,0.016381502151489258,0.03921031951904297,0.040515899658203125,0.04734969139099121,0.4349236488342285,0.35172319412231445,3.3680779933929443,0.595412015914917,0.054201364517211914,0.11762547492980957,0.05586671829223633,0.11652541160583496,0.1246945858001709,0.11488032341003418,0.12197184562683105,0.11468839645385742,0.12485098838806152,0.11564230918884277,0.11562108993530273,0.11735367774963379,0.21577072143554688,0.2616591453552246,3.851020097732544,0.7420327663421631,0.11464118957519531,0.11492013931274414,0.11641860008239746,0.11345577239990234,0.12314534187316895 diff --git a/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv b/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv index a19d73c341..9c2d945ab1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,True,True,True,17,58,290,3,True,17,Tests_passed,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,True,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,True,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,4fb5341de5a0ce773736d5841f3ff20c88c8fbe5ee27461fffe6826f486cc9ed,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Tests_failed,0bbd1f7406a01938032409a1688c8d30c3e72bc3d7089d001a97c06fa26e5432,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,9dfc74c63f94e6907d5ad1e66623a9db7fd08aeb9b25896ec13df8381c1e33e2,Tests_failed,4273bb06e66b87b5dc37cbe0f02f86671445a4bb111a588a99b01cc542f46914,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,0.03850531578063965,0.03855276107788086,0.043771982192993164,0.016625165939331055,0.04559803009033203,0.03747677803039551,0.04018449783325195,0.2372589111328125,0.17659735679626465,1.0992512702941895,0.5370993614196777,0.04761219024658203,0.06261730194091797,0.0407557487487793,0.0727238655090332,0.07419276237487793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,True,True,True,17,58,290,3,True,17,Tests_passed,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,True,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,True,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,4fb5341de5a0ce773736d5841f3ff20c88c8fbe5ee27461fffe6826f486cc9ed,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Tests_failed,0bbd1f7406a01938032409a1688c8d30c3e72bc3d7089d001a97c06fa26e5432,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,9dfc74c63f94e6907d5ad1e66623a9db7fd08aeb9b25896ec13df8381c1e33e2,Tests_failed,4273bb06e66b87b5dc37cbe0f02f86671445a4bb111a588a99b01cc542f46914,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,0.03850531578063965,0.03855276107788086,0.043771982192993164,0.016625165939331055,0.04559803009033203,0.03747677803039551,0.04018449783325195,0.2372589111328125,0.17659735679626465,1.0992512702941895,0.5370993614196777,0.04761219024658203,0.06261730194091797,0.0407557487487793,0.0727238655090332,0.07419276237487793,0.06871414184570312,0.06901311874389648,0.06819915771484375,0.07019662857055664,0.06763839721679688,0.06810688972473145,0.06926727294921875,0.11292481422424316,0.12768936157226562,1.1794383525848389,0.6085240840911865,0.0690157413482666,0.06864190101623535,0.07062530517578125,0.06990718841552734,0.07005429267883301 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 d04aadc390..5232863961 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,True,11,79,525,3,True,11,Tests_passed,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,True,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,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,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,Merge_failed,30cd2d66c7170814a91c53ee1c221fe99947661c0847bfee410d9cf5ac90b612,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,4108aeb5b976aaac0721b3b360e0dcfa0c159a17d06553494c801a73c545838e,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Tests_failed,1ca65979844ed128b5bce032291f94ec2d884a04f981058b24b59fb1e0b4351b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,0.010426521301269531,0.03499627113342285,0.009773492813110352,0.015441179275512695,0.0433506965637207,0.034964561462402344,0.03647470474243164,0.04981350898742676,0.16113877296447754,1.3190176486968994,0.4812631607055664,0.04254722595214844,0.0645301342010498,0.04241824150085449,0.06402850151062012,0.06345248222351074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,True,11,79,525,3,True,11,Tests_passed,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,True,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,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,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,Merge_failed,30cd2d66c7170814a91c53ee1c221fe99947661c0847bfee410d9cf5ac90b612,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,4108aeb5b976aaac0721b3b360e0dcfa0c159a17d06553494c801a73c545838e,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Tests_failed,1ca65979844ed128b5bce032291f94ec2d884a04f981058b24b59fb1e0b4351b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,0.010426521301269531,0.03499627113342285,0.009773492813110352,0.015441179275512695,0.0433506965637207,0.034964561462402344,0.03647470474243164,0.04981350898742676,0.16113877296447754,1.3190176486968994,0.4812631607055664,0.04254722595214844,0.0645301342010498,0.04241824150085449,0.06402850151062012,0.06345248222351074,0.062377214431762695,0.06349539756774902,0.06066584587097168,0.059876203536987305,0.060709238052368164,0.0631265640258789,0.061860084533691406,0.10776472091674805,0.12073945999145508,1.2626662254333496,0.5220792293548584,0.06182456016540527,0.06172466278076172,0.062328338623046875,0.06321477890014648,0.06290102005004883 diff --git a/results/combined/merges_timed/learning-layers/socialsemanticserver.csv b/results/combined/merges_timed/learning-layers/socialsemanticserver.csv index 7a5a446069..72a93595bc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,True,160,550,7743.0,2,True,160,Tests_passed,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,True,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,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,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c873babb6da6cc9b8c0c2e81e0bce9eb220bb861af3a377cf6d576e1081a4798,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,2a3459f220e708bae6a1c365dd04f49c2a2bd30de8f908c1256cec057cf5e044,Tests_failed,2907c28c2a16fe96acb5cefaf9ff31ff24d3e234a6abc96b528f14912ba73240,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,0.04172086715698242,0.04273509979248047,0.04770517349243164,0.06236124038696289,0.047437191009521484,0.047283172607421875,0.04734349250793457,0.12096071243286133,0.0985260009765625,0.5605406761169434,2.9497411251068115,0.09109640121459961,0.0910944938659668,0.09957528114318848,0.0929098129272461,0.0936424732208252 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,True,160,550,7743.0,2,True,160,Tests_passed,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,True,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,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,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c873babb6da6cc9b8c0c2e81e0bce9eb220bb861af3a377cf6d576e1081a4798,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,2a3459f220e708bae6a1c365dd04f49c2a2bd30de8f908c1256cec057cf5e044,Tests_failed,2907c28c2a16fe96acb5cefaf9ff31ff24d3e234a6abc96b528f14912ba73240,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,0.04172086715698242,0.04273509979248047,0.04770517349243164,0.06236124038696289,0.047437191009521484,0.047283172607421875,0.04734349250793457,0.12096071243286133,0.0985260009765625,0.5605406761169434,2.9497411251068115,0.09109640121459961,0.0910944938659668,0.09957528114318848,0.0929098129272461,0.0936424732208252,0.0959618091583252,0.09397220611572266,0.1017007827758789,0.10162711143493652,0.12777066230773926,0.13090133666992188,0.1034994125366211,0.1737363338470459,0.17192435264587402,0.7303204536437988,3.401860475540161,0.09540581703186035,0.09481143951416016,0.09832143783569336,0.09659814834594727,0.09356856346130371 diff --git a/results/combined/merges_timed/learnlib/learnlib.csv b/results/combined/merges_timed/learnlib/learnlib.csv index 7442b920e9..d040669b02 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,True,53,70,166,2,True,53,Tests_passed,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,True,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,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,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,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,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,5d21c9139d4a4d57c5bf90dc676267c3ead237fd9f3cbfb81ba6658723e63576,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,0.07172513008117676,0.049697160720825195,0.0421295166015625,0.024904251098632812,0.06630849838256836,0.05513882637023926,0.050566673278808594,0.19201254844665527,0.13240408897399902,1.030048131942749,0.5859131813049316,0.05489397048950195,0.09019184112548828,0.06918764114379883,0.09323954582214355,0.07451009750366211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,True,53,70,166,2,True,53,Tests_passed,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,True,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,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,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,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,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,5d21c9139d4a4d57c5bf90dc676267c3ead237fd9f3cbfb81ba6658723e63576,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,0.07172513008117676,0.049697160720825195,0.0421295166015625,0.024904251098632812,0.06630849838256836,0.05513882637023926,0.050566673278808594,0.19201254844665527,0.13240408897399902,1.030048131942749,0.5859131813049316,0.05489397048950195,0.09019184112548828,0.06918764114379883,0.09323954582214355,0.07451009750366211,0.08684611320495605,0.06930160522460938,0.07201719284057617,0.07377123832702637,0.09063720703125,0.09417152404785156,0.07281303405761719,0.10889267921447754,0.1032705307006836,1.0653114318847656,0.6269402503967285,0.07185649871826172,0.0731956958770752,0.08673834800720215,0.08934807777404785,0.07157444953918457 diff --git a/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv b/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv index 20687b15dc..b25fce035f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,True,True,Tests_passed,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,True,5,33,64,2,True,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,True,5,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,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,363ae636ae27bf508209f6b0da4705e03dfac6b4241d0913e3aa5ebd14ee834a,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,0.04007863998413086,0.04116630554199219,0.041780948638916016,0.013750791549682617,0.0411226749420166,0.04192066192626953,0.043111324310302734,0.16118335723876953,0.11271953582763672,0.8872554302215576,0.3512580394744873,0.02896571159362793,0.054700613021850586,0.029032230377197266,0.05597257614135742,0.05305910110473633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,True,True,Tests_passed,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,True,5,33,64,2,True,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,True,5,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,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,363ae636ae27bf508209f6b0da4705e03dfac6b4241d0913e3aa5ebd14ee834a,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,Tests_passed,3b400dcf66d07e84bd94659fc477b7cc9c9fb74985594c2807d6cb5d85c640a5,0.04007863998413086,0.04116630554199219,0.041780948638916016,0.013750791549682617,0.0411226749420166,0.04192066192626953,0.043111324310302734,0.16118335723876953,0.11271953582763672,0.8872554302215576,0.3512580394744873,0.02896571159362793,0.054700613021850586,0.029032230377197266,0.05597257614135742,0.05305910110473633,0.05190467834472656,0.052570343017578125,0.05237841606140137,0.05275368690490723,0.05246257781982422,0.052490949630737305,0.05116581916809082,0.08474898338317871,0.08490490913391113,0.8821220397949219,0.38539981842041016,0.05241847038269043,0.05251789093017578,0.052225589752197266,0.05095386505126953,0.0529634952545166 diff --git a/results/combined/merges_timed/lemire/externalsortinginjava.csv b/results/combined/merges_timed/lemire/externalsortinginjava.csv index 10f6cfced5..64040b3c7b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,True,False,Tests_passed,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,True,5,53,313,2,True,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,True,5,True,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,fdcfda25c94e8c9e3fd8f447611a2946612a428774c11493ca1b21b42c65141e,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,Merge_failed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Merge_failed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,e0ef8a2319598a59f8c5a98f592e8f597d94e1fb841c07b7643c411dc2bfcfb4,Tests_failed,7284fe9dffa9645a79a164e76145fed29e66bfecec8dcc69bc5a4fdfde0e4fe9,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,0.0433504581451416,0.04420757293701172,0.03700423240661621,0.015283823013305664,0.040822744369506836,0.0417475700378418,0.03659772872924805,0.1664748191833496,0.10921001434326172,1.2440025806427002,0.39176392555236816,0.04172658920288086,0.05877423286437988,0.04138755798339844,0.05959486961364746,0.06272363662719727 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,True,False,Tests_passed,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,True,5,53,313,2,True,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,True,5,True,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,fdcfda25c94e8c9e3fd8f447611a2946612a428774c11493ca1b21b42c65141e,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,Merge_failed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Merge_failed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,e0ef8a2319598a59f8c5a98f592e8f597d94e1fb841c07b7643c411dc2bfcfb4,Tests_failed,7284fe9dffa9645a79a164e76145fed29e66bfecec8dcc69bc5a4fdfde0e4fe9,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,36297280211d477e99c446eaa3790e63560926568cdf0b563406643eb71b9e97,0.0433504581451416,0.04420757293701172,0.03700423240661621,0.015283823013305664,0.040822744369506836,0.0417475700378418,0.03659772872924805,0.1664748191833496,0.10921001434326172,1.2440025806427002,0.39176392555236816,0.04172658920288086,0.05877423286437988,0.04138755798339844,0.05959486961364746,0.06272363662719727,0.05792593955993652,0.06289196014404297,0.056331634521484375,0.06157398223876953,0.0576937198638916,0.060108184814453125,0.060303449630737305,0.08896446228027344,0.09876108169555664,1.3825716972351074,0.47446537017822266,0.060364723205566406,0.0597376823425293,0.05780196189880371,0.058948516845703125,0.06344127655029297 diff --git a/results/combined/merges_timed/lemire/javaewah.csv b/results/combined/merges_timed/lemire/javaewah.csv index 4755162028..992cbd4c5a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -60,refs/heads/master,5829fc009b15699da618ec8fb4db9fe1662f20bd,b3d4c01db3a3f995dbe891cd8b1cb7b7ca518f49,735652d1068fa30e634d80de86ac9617f6182a57,,True,True,Tests_passed,388ace8eeeebd3061aa3153722574954a9895660b77076e729f3bc167370a1aa,True,20,107,2721,2,True,Tests_passed,79ff8ac147b42b8fb5ec46d79cce9e471854fc3797fceb73c290052607ad667e,True,20,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,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,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,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,0df5235b00a19731e4505ca4b7cf55ef69c9d7c4dec2e144b4874db10aca2f5e,Tests_failed,341f122e0713bac0cbdcc4ab4f69b61a29c28491f34c2e83f5367c4623ae4a6e,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,0.047254323959350586,0.0487518310546875,0.044136762619018555,0.0210874080657959,0.06313037872314453,0.058278799057006836,0.05597209930419922,0.19536614418029785,0.10270237922668457,0.967036247253418,0.7352776527404785,0.03720545768737793,0.06421375274658203,0.037634849548339844,0.0662546157836914,0.06439471244812012 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +60,refs/heads/master,5829fc009b15699da618ec8fb4db9fe1662f20bd,b3d4c01db3a3f995dbe891cd8b1cb7b7ca518f49,735652d1068fa30e634d80de86ac9617f6182a57,,True,True,Tests_passed,388ace8eeeebd3061aa3153722574954a9895660b77076e729f3bc167370a1aa,True,20,107,2721,2,True,Tests_passed,79ff8ac147b42b8fb5ec46d79cce9e471854fc3797fceb73c290052607ad667e,True,20,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,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,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,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,0df5235b00a19731e4505ca4b7cf55ef69c9d7c4dec2e144b4874db10aca2f5e,Tests_failed,341f122e0713bac0cbdcc4ab4f69b61a29c28491f34c2e83f5367c4623ae4a6e,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,0.047254323959350586,0.0487518310546875,0.044136762619018555,0.0210874080657959,0.06313037872314453,0.058278799057006836,0.05597209930419922,0.19536614418029785,0.10270237922668457,0.967036247253418,0.7352776527404785,0.03720545768737793,0.06421375274658203,0.037634849548339844,0.0662546157836914,0.06439471244812012,0.0616457462310791,0.061859130859375,0.0633535385131836,0.06063270568847656,0.06253361701965332,0.06500411033630371,0.061872005462646484,0.09835481643676758,0.09113264083862305,1.001558780670166,0.8080899715423584,0.061106204986572266,0.0602571964263916,0.06244516372680664,0.06208658218383789,0.06058931350708008 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 b0d9928c2d..21bd126882 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,True,False,Tests_passed,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,True,3,26,68,2,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,True,3,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,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,8ce70b0fbc3b3108b66c4cdb597452225fd47469dcc9aa23ac05228b2c68f69d,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1606e0e09c87d7ebf5a68868ddb1d6804522778aad6e494d0db0faedecb28ccf,Tests_failed,8968b10ab31f62f43030a81caffc8e202d0bdd0b6cdee4ff835ae3ca7678230b,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,0.008632183074951172,0.008667945861816406,0.008685111999511719,0.012922525405883789,0.00852513313293457,0.008783340454101562,0.008538246154785156,0.036141395568847656,0.07352519035339355,1.2483654022216797,0.3712320327758789,0.038790225982666016,0.040467023849487305,0.03877091407775879,0.04134392738342285,0.04179191589355469 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,True,False,Tests_passed,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,True,3,26,68,2,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,True,3,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,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,8ce70b0fbc3b3108b66c4cdb597452225fd47469dcc9aa23ac05228b2c68f69d,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1606e0e09c87d7ebf5a68868ddb1d6804522778aad6e494d0db0faedecb28ccf,Tests_failed,8968b10ab31f62f43030a81caffc8e202d0bdd0b6cdee4ff835ae3ca7678230b,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,0.008632183074951172,0.008667945861816406,0.008685111999511719,0.012922525405883789,0.00852513313293457,0.008783340454101562,0.008538246154785156,0.036141395568847656,0.07352519035339355,1.2483654022216797,0.3712320327758789,0.038790225982666016,0.040467023849487305,0.03877091407775879,0.04134392738342285,0.04179191589355469,0.03968358039855957,0.0394442081451416,0.03963279724121094,0.03879070281982422,0.038977861404418945,0.03969931602478027,0.03964662551879883,0.06998324394226074,0.09214353561401367,1.1967790126800537,0.4237058162689209,0.039309024810791016,0.040529727935791016,0.04045701026916504,0.04002118110656738,0.04073953628540039 diff --git a/results/combined/merges_timed/lettuce-io/lettuce-core.csv b/results/combined/merges_timed/lettuce-io/lettuce-core.csv index f05055f233..dc0fcf6fc7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,True,68,300,2787,2,True,68,Tests_passed,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,True,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,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,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_failed,f1c94e0dce32d814d39244c46b06552251b45728c48df3e5122649385f77261c,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,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,d888a64f3dfcaa9c0a02c88dc351ad39c8468c5de0cc999b11cf1eb1cf0685c4,Tests_failed,f1c94e0dce32d814d39244c46b06552251b45728c48df3e5122649385f77261c,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.02972865104675293,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.12177395820617676,1.007312536239624,1.097792387008667,0.05841374397277832,0.07065081596374512,0.05685591697692871,0.07075071334838867,0.0799722671508789 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,True,68,300,2787,2,True,68,Tests_passed,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,True,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,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,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_failed,f1c94e0dce32d814d39244c46b06552251b45728c48df3e5122649385f77261c,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,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,d888a64f3dfcaa9c0a02c88dc351ad39c8468c5de0cc999b11cf1eb1cf0685c4,Tests_failed,f1c94e0dce32d814d39244c46b06552251b45728c48df3e5122649385f77261c,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.02972865104675293,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.12177395820617676,1.007312536239624,1.097792387008667,0.05841374397277832,0.07065081596374512,0.05685591697692871,0.07075071334838867,0.0799722671508789,0.07718777656555176,0.07874774932861328,0.06876802444458008,0.08533334732055664,0.0699162483215332,0.07916569709777832,0.07958722114562988,0.10107898712158203,0.1138758659362793,0.9903595447540283,1.1694810390472412,0.06976079940795898,0.08013153076171875,0.08135628700256348,0.06919193267822266,0.07714986801147461 diff --git a/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv b/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv index b39920ddc8..219580af03 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,True,9,10,631,65,True,72,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,True,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,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,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,cd27433614208e6ce3a2d74bb99d940f4a21a8337aa6a860e4f9dfa3a9c5cf2a,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Tests_failed,e5f7467355bf38a0296d348219db5905eda1d9a3cdc50d22ce231c4b3e33d1da,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,0.04309582710266113,0.05026364326477051,0.04044079780578613,0.015623807907104492,0.04684710502624512,0.03870201110839844,0.041641950607299805,0.16371655464172363,0.1273632049560547,0.6868512630462646,0.7015149593353271,0.043921470642089844,0.04464602470397949,0.04317331314086914,0.04432964324951172,0.04563641548156738 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,True,9,10,631,65,True,72,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,True,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,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,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,cd27433614208e6ce3a2d74bb99d940f4a21a8337aa6a860e4f9dfa3a9c5cf2a,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Tests_failed,e5f7467355bf38a0296d348219db5905eda1d9a3cdc50d22ce231c4b3e33d1da,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,0.04309582710266113,0.05026364326477051,0.04044079780578613,0.015623807907104492,0.04684710502624512,0.03870201110839844,0.041641950607299805,0.16371655464172363,0.1273632049560547,0.6868512630462646,0.7015149593353271,0.043921470642089844,0.04464602470397949,0.04317331314086914,0.04432964324951172,0.04563641548156738,0.04573678970336914,0.046441078186035156,0.04599738121032715,0.04568004608154297,0.04409480094909668,0.04728412628173828,0.04597330093383789,0.07883429527282715,0.09995388984680176,0.8110237121582031,0.8062171936035156,0.04472494125366211,0.04659748077392578,0.04616189002990723,0.046164512634277344,0.04601144790649414 diff --git a/results/combined/merges_timed/librato/metrics-librato.csv b/results/combined/merges_timed/librato/metrics-librato.csv index dfd8254ca9..b055e58def 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,True,True,Tests_passed,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,True,6,32,159,2,True,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,True,6,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,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,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,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,47acf419ead156b0054883fde554d986b897dcffb932eafd16097128004cdc25,Tests_failed,228c26c5f9e062cfaa8152f44718cc0319e736e081574226730c2a39c22fc2d3,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,0.04018378257751465,0.04546380043029785,0.04538583755493164,0.014978647232055664,0.015216350555419922,0.011353492736816406,0.011136054992675781,0.16006040573120117,0.11980175971984863,0.9072237014770508,0.4135127067565918,0.030263423919677734,0.05596756935119629,0.03039073944091797,0.054425954818725586,0.05523991584777832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,True,True,Tests_passed,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,True,6,32,159,2,True,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,True,6,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,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,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,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,47acf419ead156b0054883fde554d986b897dcffb932eafd16097128004cdc25,Tests_failed,228c26c5f9e062cfaa8152f44718cc0319e736e081574226730c2a39c22fc2d3,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,0.04018378257751465,0.04546380043029785,0.04538583755493164,0.014978647232055664,0.015216350555419922,0.011353492736816406,0.011136054992675781,0.16006040573120117,0.11980175971984863,0.9072237014770508,0.4135127067565918,0.030263423919677734,0.05596756935119629,0.03039073944091797,0.054425954818725586,0.05523991584777832,0.053163766860961914,0.05264568328857422,0.05351448059082031,0.0532383918762207,0.05228567123413086,0.05325007438659668,0.05386614799499512,0.08323860168457031,0.0832817554473877,0.9406595230102539,0.44731855392456055,0.0520024299621582,0.05190634727478027,0.05280137062072754,0.052490234375,0.05337119102478027 diff --git a/results/combined/merges_timed/linkedin/camus.csv b/results/combined/merges_timed/linkedin/camus.csv index 04b2ee64a7..bc01f4e6fb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,False,True,5,6,34,2,True,5,Tests_passed,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,True,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,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,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,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,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,21cd7ab55d49a1f239b00e3f8e7eccef04a78054f8c6feb47ef9d9aaf2a641f3,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,0.03269696235656738,0.033345937728881836,0.04568600654602051,0.059470415115356445,0.04571127891540527,0.04559636116027832,0.04497075080871582,0.08199763298034668,0.08738255500793457,1.317577600479126,0.601356029510498,0.09198689460754395,0.11897802352905273,0.08961939811706543,0.11694478988647461,0.09429645538330078 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,False,True,5,6,34,2,True,5,Tests_passed,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,True,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,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,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,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,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,21cd7ab55d49a1f239b00e3f8e7eccef04a78054f8c6feb47ef9d9aaf2a641f3,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,0.03269696235656738,0.033345937728881836,0.04568600654602051,0.059470415115356445,0.04571127891540527,0.04559636116027832,0.04497075080871582,0.08199763298034668,0.08738255500793457,1.317577600479126,0.601356029510498,0.09198689460754395,0.11897802352905273,0.08961939811706543,0.11694478988647461,0.09429645538330078,0.11067771911621094,0.059372663497924805,0.12755155563354492,0.12504267692565918,0.05937027931213379,0.12627720832824707,0.12935566902160645,0.08947277069091797,0.16054773330688477,1.4078400135040283,0.6026058197021484,0.11225199699401855,0.058699846267700195,0.11331558227539062,0.11195111274719238,0.05694937705993652 diff --git a/results/combined/merges_timed/linlinjava/litemall.csv b/results/combined/merges_timed/linlinjava/litemall.csv index e47f75b7fb..8a13bd4903 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,True,79,193,16277,7,True,80,Tests_passed,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,True,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,True,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,c462aaac5034e7d1e65aab8a1cef70594ab62879059558f117a2404f6372b555,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,Merge_failed,f06c4dbcd0cac1c6a02674ba408f53c6477141bc05d0964030fdf17d0dfd4c64,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,c6a4f9310d7bdd26b1aaae1e4886c460ee5ed4747b3508d4f08d6280069df638,Merge_failed,f43b970adf5f6867d56c6227e00d9e0a576f989a9067f8b743c59813d098f346,Merge_failed,faf75d9580bbce49781dc02bf56210b85ce222bb7c032fa67be4e6da599286ed,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.10898542404174805,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.4702432155609131,0.7077407836914062,0.9391429424285889,0.296724796295166,0.272235631942749,0.30936479568481445,0.3288578987121582,0.2758803367614746 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,True,79,193,16277,7,True,80,Tests_passed,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,True,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,True,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,c462aaac5034e7d1e65aab8a1cef70594ab62879059558f117a2404f6372b555,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,Merge_failed,f06c4dbcd0cac1c6a02674ba408f53c6477141bc05d0964030fdf17d0dfd4c64,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,c6a4f9310d7bdd26b1aaae1e4886c460ee5ed4747b3508d4f08d6280069df638,Merge_failed,f43b970adf5f6867d56c6227e00d9e0a576f989a9067f8b743c59813d098f346,Merge_failed,faf75d9580bbce49781dc02bf56210b85ce222bb7c032fa67be4e6da599286ed,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,57ecbdbf9cbd02deb2e88ded1f2871853bffc13ce0f5fdba8a3c0b083646d70f,Merge_failed,0485ab8df4d9b5dc0fecbf15b5bb7438c6996db9d05edeab87f1366c7a132a5f,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.10898542404174805,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.4702432155609131,0.7077407836914062,0.9391429424285889,0.296724796295166,0.272235631942749,0.30936479568481445,0.3288578987121582,0.2758803367614746,0.3160266876220703,0.2622344493865967,0.31619787216186523,0.26552248001098633,0.3197517395019531,0.31482958793640137,0.3159196376800537,0.44767332077026367,0.48741745948791504,0.9289901256561279,1.2190499305725098,0.3187432289123535,0.3207247257232666,0.3164386749267578,0.3181905746459961,0.2676868438720703 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 2efd358988..a34b7f9c00 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,True,13,35,151,2,True,15,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,True,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,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_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,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_passed,0bb168b2fffa0f42231d6555dbfe57cc0b9dc2154368790ed0ddbd6ffc3be794,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,0.04230976104736328,0.049169301986694336,0.041414737701416016,0.01705455780029297,0.04165315628051758,0.0445706844329834,0.046222686767578125,0.1654796600341797,0.1234736442565918,1.0100643634796143,0.3309004306793213,0.0390467643737793,0.06470847129821777,0.03283953666687012,0.06232452392578125,0.0640103816986084 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,True,13,35,151,2,True,15,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,True,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,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_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,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_passed,0bb168b2fffa0f42231d6555dbfe57cc0b9dc2154368790ed0ddbd6ffc3be794,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,0.04230976104736328,0.049169301986694336,0.041414737701416016,0.01705455780029297,0.04165315628051758,0.0445706844329834,0.046222686767578125,0.1654796600341797,0.1234736442565918,1.0100643634796143,0.3309004306793213,0.0390467643737793,0.06470847129821777,0.03283953666687012,0.06232452392578125,0.0640103816986084,0.06109023094177246,0.06130242347717285,0.0588681697845459,0.06050682067871094,0.06136512756347656,0.057990312576293945,0.06269216537475586,0.09566426277160645,0.09443092346191406,1.0228490829467773,0.3620119094848633,0.060463905334472656,0.06378984451293945,0.05866575241088867,0.06193089485168457,0.06174302101135254 diff --git a/results/combined/merges_timed/lintool/clueweb.csv b/results/combined/merges_timed/lintool/clueweb.csv index 5ce5558769..27bdeecbac 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,True,True,Tests_passed,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,True,58,130,14456,10,True,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,True,62,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,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,3e20dc8049e11c7078858160c7f70cfa5346935b851755e8828fe15d100858e1,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,1d0ca19d3ae7093aac1dd941a00882debc53ae33da6b04ecc87570797198715b,Merge_timedout,,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,0.04852461814880371,0.05529189109802246,0.06383395195007324,0.07352042198181152,0.06364154815673828,0.06183457374572754,0.06898283958435059,0.3765068054199219,0.28128528594970703,3.8125829696655273,-1.0,0.13881683349609375,0.1638319492340088,0.1404590606689453,0.17331576347351074,0.17268085479736328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,True,True,Tests_passed,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,True,58,130,14456,10,True,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,True,62,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,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,3e20dc8049e11c7078858160c7f70cfa5346935b851755e8828fe15d100858e1,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,1d0ca19d3ae7093aac1dd941a00882debc53ae33da6b04ecc87570797198715b,Merge_timedout,,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,0.04852461814880371,0.05529189109802246,0.06383395195007324,0.07352042198181152,0.06364154815673828,0.06183457374572754,0.06898283958435059,0.3765068054199219,0.28128528594970703,3.8125829696655273,-1.0,0.13881683349609375,0.1638319492340088,0.1404590606689453,0.17331576347351074,0.17268085479736328,0.165604829788208,0.1628262996673584,0.18190431594848633,0.1685335636138916,0.27907514572143555,0.2893972396850586,0.21126294136047363,0.41620779037475586,0.4179661273956299,3.94256854057312,-1.0,0.1530911922454834,0.16878867149353027,0.16892075538635254,0.16414117813110352,0.15906238555908203 diff --git a/results/combined/merges_timed/lionsoul2014/jcseg.csv b/results/combined/merges_timed/lionsoul2014/jcseg.csv index 97a5d7d627..b41ea2db23 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,True,28,156,577,4,True,28,Tests_passed,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,True,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,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,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,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,9837ccd799758c69bc380df18cbcfd0945751a15245817a81b8d06b324fe1ad4,Tests_failed,dff3ec27bc9234ea6ab261728f3509bdf1c13baca49365ec809a861b9a621639,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,0.04664802551269531,0.046477317810058594,0.06439399719238281,0.07639741897583008,0.06470799446105957,0.05585670471191406,0.06449246406555176,0.15077662467956543,0.20714783668518066,2.0143930912017822,0.5909550189971924,0.12082529067993164,0.2131657600402832,0.03635144233703613,0.20322227478027344,0.17365074157714844 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,True,28,156,577,4,True,28,Tests_passed,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,True,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,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,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,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,9837ccd799758c69bc380df18cbcfd0945751a15245817a81b8d06b324fe1ad4,Tests_failed,dff3ec27bc9234ea6ab261728f3509bdf1c13baca49365ec809a861b9a621639,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,0.04664802551269531,0.046477317810058594,0.06439399719238281,0.07639741897583008,0.06470799446105957,0.05585670471191406,0.06449246406555176,0.15077662467956543,0.20714783668518066,2.0143930912017822,0.5909550189971924,0.12082529067993164,0.2131657600402832,0.03635144233703613,0.20322227478027344,0.17365074157714844,0.1907181739807129,0.11385273933410645,0.2116398811340332,0.20691394805908203,0.19350719451904297,0.19201087951660156,0.12542080879211426,0.32273149490356445,0.17424941062927246,2.231235980987549,0.6596176624298096,0.20216965675354004,0.2067422866821289,0.1903362274169922,0.12398004531860352,0.17775440216064453 diff --git a/results/combined/merges_timed/liyiorg/weixin-popular.csv b/results/combined/merges_timed/liyiorg/weixin-popular.csv index 49974ffb78..bf00a26ab9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,True,34,89,3176,2,True,34,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,a45c0de3b4f4d7f82bee9da249ce6ea10a2badec2efc955f2975fc51b5bbd6f4,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,1fe823b4a2fa873ea6a5a3fb83a20ba27bca5ab33cc602df61a1899cbe414d6b,Tests_failed,fa0eb757a68134e82ff1eba83de47bc4ccc17a3ad9c9f3c95d437a8fb3cfa8bc,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.02007293701171875,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.12128210067749023,0.45008349418640137,0.6279382705688477,0.0488283634185791,0.048198699951171875,0.048418521881103516,0.06278228759765625,0.06419634819030762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,True,34,89,3176,2,True,34,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,a45c0de3b4f4d7f82bee9da249ce6ea10a2badec2efc955f2975fc51b5bbd6f4,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,1fe823b4a2fa873ea6a5a3fb83a20ba27bca5ab33cc602df61a1899cbe414d6b,Tests_failed,fa0eb757a68134e82ff1eba83de47bc4ccc17a3ad9c9f3c95d437a8fb3cfa8bc,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_passed,5841a79487429248fef881d185266c69f6dc6b7fd8fc693147498584dedff3d0,Tests_failed,16598ac458f26a4d8073a805482b68e989314436f4a50307e3e661a93d8dddbb,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.02007293701171875,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.12128210067749023,0.45008349418640137,0.6279382705688477,0.0488283634185791,0.048198699951171875,0.048418521881103516,0.06278228759765625,0.06419634819030762,0.06425189971923828,0.06390070915222168,0.06192755699157715,0.06353092193603516,0.06406760215759277,0.06512808799743652,0.06528425216674805,0.0990455150604248,0.10434484481811523,0.5213351249694824,0.7815876007080078,0.0641934871673584,0.06420683860778809,0.06113553047180176,0.06233835220336914,0.06318378448486328 diff --git a/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv b/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv index dc504a24e0..7c858330e5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,True,6,55,210,4,True,6,Tests_passed,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,True,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,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,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,Merge_failed,d7d70d0d2c9a872996542b1fb5f78e92d74e783b44016a707e70b6796eaac446,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,b2fd728719cedb5f52270c648172f7c03cb8ff59e48f7dde6a3b63c9457440b3,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,9966211da6c8f175f483434376849c497ea82d5d94036da4bf3bb8c6b5ad1d68,Tests_failed,5f4bd133cbb9a12ca04a3a5da2ec3e42657d3fdd99e0abdb1363478ec8979eb1,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,0.0380861759185791,0.041742563247680664,0.0353083610534668,0.013329744338989258,0.04074859619140625,0.04034876823425293,0.039720773696899414,0.2871897220611572,0.2534513473510742,1.4109880924224854,0.3136770725250244,0.05173659324645996,0.07258439064025879,0.05368757247924805,0.07623648643493652,0.07575416564941406 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,True,6,55,210,4,True,6,Tests_passed,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,True,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,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,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,Merge_failed,d7d70d0d2c9a872996542b1fb5f78e92d74e783b44016a707e70b6796eaac446,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,b2fd728719cedb5f52270c648172f7c03cb8ff59e48f7dde6a3b63c9457440b3,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,9966211da6c8f175f483434376849c497ea82d5d94036da4bf3bb8c6b5ad1d68,Tests_failed,5f4bd133cbb9a12ca04a3a5da2ec3e42657d3fdd99e0abdb1363478ec8979eb1,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,0.0380861759185791,0.041742563247680664,0.0353083610534668,0.013329744338989258,0.04074859619140625,0.04034876823425293,0.039720773696899414,0.2871897220611572,0.2534513473510742,1.4109880924224854,0.3136770725250244,0.05173659324645996,0.07258439064025879,0.05368757247924805,0.07623648643493652,0.07575416564941406,0.07132863998413086,0.07270240783691406,0.07154607772827148,0.07132363319396973,0.07223868370056152,0.07161617279052734,0.07124948501586914,0.1333754062652588,0.1749858856201172,1.487617015838623,0.3787658214569092,0.07275938987731934,0.0718538761138916,0.07181525230407715,0.0728611946105957,0.07296156883239746 diff --git a/results/combined/merges_timed/logstash/logstash-logback-encoder.csv b/results/combined/merges_timed/logstash/logstash-logback-encoder.csv index e4bbb8a8a8..ad78aeaa32 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,True,64,331,2882,3,True,64,Tests_passed,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,True,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,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_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,7831f4637b8307a9ca88209009e2db03b66c8ba6bafd4f04b0dc331addcce594,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_failed,7831f4637b8307a9ca88209009e2db03b66c8ba6bafd4f04b0dc331addcce594,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.04615640640258789,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.1630089282989502,0.05350661277770996,1.6563451290130615,0.058013916015625,0.14267468452453613,0.05661296844482422,0.14402079582214355,0.11766409873962402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,True,64,331,2882,3,True,64,Tests_passed,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,True,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,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_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,7831f4637b8307a9ca88209009e2db03b66c8ba6bafd4f04b0dc331addcce594,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_failed,7831f4637b8307a9ca88209009e2db03b66c8ba6bafd4f04b0dc331addcce594,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,Tests_passed,ae2f65c08a8f83ce6ce81d002abdb61dcada996a98f5fe5b7fa5c6a748c73cea,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.04615640640258789,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.1630089282989502,0.05350661277770996,1.6563451290130615,0.058013916015625,0.14267468452453613,0.05661296844482422,0.14402079582214355,0.11766409873962402,0.12242794036865234,0.1335771083831787,0.11062121391296387,0.13458251953125,0.11149239540100098,0.14453864097595215,0.11162900924682617,0.20089292526245117,0.18903565406799316,0.12565302848815918,1.739187479019165,0.11326718330383301,0.1330709457397461,0.11314916610717773,0.13380861282348633,0.11443066596984863 diff --git a/results/combined/merges_timed/lookfirst/sardine.csv b/results/combined/merges_timed/lookfirst/sardine.csv index eeffdb8148..f258d94292 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,True,2,7,15,2,True,2,Tests_passed,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,True,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,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,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,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,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,a9ee4c460c909a2ae6b991f8708e9616219b9b26fd6126032ab82e9cd1a5a22a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,0.04456901550292969,0.04390263557434082,0.04284381866455078,0.022293567657470703,0.0423581600189209,0.04619121551513672,0.04362297058105469,0.16859650611877441,0.09911894798278809,1.536536455154419,0.4199850559234619,0.03282785415649414,0.06933069229125977,0.040930747985839844,0.07030344009399414,0.07349205017089844 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,True,2,7,15,2,True,2,Tests_passed,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,True,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,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,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,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,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,a9ee4c460c909a2ae6b991f8708e9616219b9b26fd6126032ab82e9cd1a5a22a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,0.04456901550292969,0.04390263557434082,0.04284381866455078,0.022293567657470703,0.0423581600189209,0.04619121551513672,0.04362297058105469,0.16859650611877441,0.09911894798278809,1.536536455154419,0.4199850559234619,0.03282785415649414,0.06933069229125977,0.040930747985839844,0.07030344009399414,0.07349205017089844,0.06609082221984863,0.0681297779083252,0.05864691734313965,0.06949710845947266,0.06825375556945801,0.0688478946685791,0.07126164436340332,0.090362548828125,0.09680461883544922,1.479865312576294,0.45643115043640137,0.06733298301696777,0.0662071704864502,0.058244943618774414,0.06550931930541992,0.06677842140197754 diff --git a/results/combined/merges_timed/lukas-krecan/json2xml.csv b/results/combined/merges_timed/lukas-krecan/json2xml.csv index da0868004e..1863e5b0f5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,True,11,19,254,3,True,11,Tests_passed,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,True,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,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,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,b5d509176faf9a0cbf27aceb097842ce624c16d4bd0c6c6af5faf1c1e719510d,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,0.04297327995300293,0.03908562660217285,0.04451870918273926,0.014052391052246094,0.041947126388549805,0.039423227310180664,0.03841066360473633,0.23326611518859863,0.1629347801208496,1.2023577690124512,0.42671990394592285,0.0300595760345459,0.07232141494750977,0.02937769889831543,0.07360410690307617,0.07257556915283203 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,True,11,19,254,3,True,11,Tests_passed,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,True,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,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,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,b5d509176faf9a0cbf27aceb097842ce624c16d4bd0c6c6af5faf1c1e719510d,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,Tests_passed,7e21d911541a6b9f837190d1a863e151f5acbbb097f88d2080fedc0e17e7fba9,0.04297327995300293,0.03908562660217285,0.04451870918273926,0.014052391052246094,0.041947126388549805,0.039423227310180664,0.03841066360473633,0.23326611518859863,0.1629347801208496,1.2023577690124512,0.42671990394592285,0.0300595760345459,0.07232141494750977,0.02937769889831543,0.07360410690307617,0.07257556915283203,0.07103347778320312,0.0699615478515625,0.06995320320129395,0.07024955749511719,0.07126259803771973,0.07059431076049805,0.06968832015991211,0.1188211441040039,0.1263573169708252,1.2411363124847412,0.45879530906677246,0.07072210311889648,0.07136869430541992,0.07087326049804688,0.07108926773071289,0.07184314727783203 diff --git a/results/combined/merges_timed/lukas-krecan/jsonunit.csv b/results/combined/merges_timed/lukas-krecan/jsonunit.csv index df8eb8f629..47cb9a83f3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -376,refs/remotes/origin/jackson-1.x,7a61777fca87b6c906be80940781f2ae80f36d82,c90ae65409409c029aed9a4f95969dbc2e41ea84,eda93eaa04a531de2708c32ce2c63e1a66754685,,True,True,True,13,27,110,7,True,13,Tests_passed,d8a6c5da9f1d2830cffa9690d70a91d3c93dc83aa91a106dd889ace4098f36bb,True,Tests_passed,1d552a224c717e6295cfed4d78ae6dcca290dbe0908144f6b94c531f55c4069f,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,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,62bc03afb42bea8ac00e8e2163d494c1771e09bd3def111b1fdc17201ae4f3e1,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,42dfc52f268516cca10cb55f49cdc510303b2ad24ae5514b3e423982ed00dd29,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,fe921019928b5b620b4308aec2e3fa7747164903668525e948066974ee7f20d1,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,0.03705763816833496,0.04350924491882324,0.043884992599487305,0.01572418212890625,0.04614448547363281,0.04389238357543945,0.04522132873535156,0.4717438220977783,0.40268921852111816,1.801511287689209,0.3860924243927002,0.07529568672180176,0.11552977561950684,0.07622289657592773,0.11460447311401367,0.11798572540283203 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +376,refs/remotes/origin/jackson-1.x,7a61777fca87b6c906be80940781f2ae80f36d82,c90ae65409409c029aed9a4f95969dbc2e41ea84,eda93eaa04a531de2708c32ce2c63e1a66754685,,True,True,True,13,27,110,7,True,13,Tests_passed,d8a6c5da9f1d2830cffa9690d70a91d3c93dc83aa91a106dd889ace4098f36bb,True,Tests_passed,1d552a224c717e6295cfed4d78ae6dcca290dbe0908144f6b94c531f55c4069f,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,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,62bc03afb42bea8ac00e8e2163d494c1771e09bd3def111b1fdc17201ae4f3e1,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,42dfc52f268516cca10cb55f49cdc510303b2ad24ae5514b3e423982ed00dd29,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,fe921019928b5b620b4308aec2e3fa7747164903668525e948066974ee7f20d1,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,0.03705763816833496,0.04350924491882324,0.043884992599487305,0.01572418212890625,0.04614448547363281,0.04389238357543945,0.04522132873535156,0.4717438220977783,0.40268921852111816,1.801511287689209,0.3860924243927002,0.07529568672180176,0.11552977561950684,0.07622289657592773,0.11460447311401367,0.11798572540283203,0.11168098449707031,0.11387372016906738,0.10983490943908691,0.11169552803039551,0.1100466251373291,0.11362910270690918,0.1130220890045166,0.22074532508850098,0.3068366050720215,1.8343100547790527,0.5070204734802246,0.11041522026062012,0.1113591194152832,0.11001968383789062,0.11081218719482422,0.11088442802429199 diff --git a/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv b/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv index 8f49872cf2..03500c0e3a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,True,5,24,94.0,3,True,5,Tests_passed,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,True,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,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,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,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,6af28ba33dc1e147c8581cd4b6641215bfae6db9d98c67368923f13f9f2594d4,Tests_failed,c98428b4da789c9888012379d811dc8f5d98ef1e4940666c4e0f0caab5b4bf1b,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,0.04282855987548828,0.04440593719482422,0.04861021041870117,0.01809525489807129,0.05360674858093262,0.035639286041259766,0.04233098030090332,0.23371100425720215,0.16594266891479492,1.4362125396728516,0.36072230339050293,0.034329891204833984,0.08352971076965332,0.03508448600769043,0.08191776275634766,0.0843806266784668 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,True,5,24,94.0,3,True,5,Tests_passed,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,True,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,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,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,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,6af28ba33dc1e147c8581cd4b6641215bfae6db9d98c67368923f13f9f2594d4,Tests_failed,c98428b4da789c9888012379d811dc8f5d98ef1e4940666c4e0f0caab5b4bf1b,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,0.04282855987548828,0.04440593719482422,0.04861021041870117,0.01809525489807129,0.05360674858093262,0.035639286041259766,0.04233098030090332,0.23371100425720215,0.16594266891479492,1.4362125396728516,0.36072230339050293,0.034329891204833984,0.08352971076965332,0.03508448600769043,0.08191776275634766,0.0843806266784668,0.07976722717285156,0.07735514640808105,0.08179688453674316,0.08144593238830566,0.0793159008026123,0.0782308578491211,0.07984733581542969,0.12864208221435547,0.1336963176727295,1.4132325649261475,0.3982110023498535,0.08085513114929199,0.07916378974914551,0.08031439781188965,0.07840180397033691,0.07875823974609375 diff --git a/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv b/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv index 259783f0d6..0de692cdd7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,True,True,Tests_passed,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,True,4,21,144,2,True,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,True,4,True,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,d46f38fcad435aea72f776ab4f1ba9a6ac7af29f8035dcab21fa75c489691f23,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,6b7ce73b179b846f6dd45cd4bf11dd186eba1ccd95cdd982705166b42b6379ce,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,9816e6a8d86b13a26643df3ab5d0f45c19647c3b80a18a9af27f83e72a320b32,Tests_failed,b48624fa3eff372e997de12feb572d674a03a857052964c7d6d81d26b70896cb,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,0.03909707069396973,0.03859543800354004,0.03127169609069824,0.012326478958129883,0.03657698631286621,0.03479456901550293,0.0355374813079834,0.1611189842224121,0.08686661720275879,0.6514694690704346,0.2524383068084717,0.03761649131774902,0.03951263427734375,0.03866291046142578,0.04074883460998535,0.040764808654785156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,True,True,Tests_passed,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,True,4,21,144,2,True,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,True,4,True,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,d46f38fcad435aea72f776ab4f1ba9a6ac7af29f8035dcab21fa75c489691f23,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,6b7ce73b179b846f6dd45cd4bf11dd186eba1ccd95cdd982705166b42b6379ce,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,9816e6a8d86b13a26643df3ab5d0f45c19647c3b80a18a9af27f83e72a320b32,Tests_failed,b48624fa3eff372e997de12feb572d674a03a857052964c7d6d81d26b70896cb,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,0.03909707069396973,0.03859543800354004,0.03127169609069824,0.012326478958129883,0.03657698631286621,0.03479456901550293,0.0355374813079834,0.1611189842224121,0.08686661720275879,0.6514694690704346,0.2524383068084717,0.03761649131774902,0.03951263427734375,0.03866291046142578,0.04074883460998535,0.040764808654785156,0.038848876953125,0.038520097732543945,0.039351463317871094,0.03949546813964844,0.0380859375,0.03829503059387207,0.038001060485839844,0.06814861297607422,0.07716584205627441,0.6681046485900879,0.3094925880432129,0.039258480072021484,0.03888058662414551,0.03951454162597656,0.039452314376831055,0.040366411209106445 diff --git a/results/combined/merges_timed/lusito/gamedevweek.csv b/results/combined/merges_timed/lusito/gamedevweek.csv index 96e291b1e6..9712c802e0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1268,refs/remotes/origin/pull/11,bb4703104114664a8800674df2159429666c1863,ff80b1ebcd9bc61ee238da107f7baf770bca5251,8e399ff6a7b196f84ba3781b7d691eb5aaeba6d9,,True,True,True,26,88,1055.0,2,True,26,Tests_passed,accfbb20f0bf76789a82cca2a9556f1b625794272ebb0068fca02cc3b1fcc5ea,True,Tests_passed,18c5d3fe8edbba0e1dd4d46954a106f566e251c803ee17cf3f6f19a2e048aea1,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,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,40a1a65ce77b46d6708153dbff4dd4479b0b3888ae61a2038887b651903720bd,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,c1c098fd01968a37f9a14a56aa7f5783d26b4dd2f095faf62eff86eeb708cc9e,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Tests_passed,2333e3afb2966006d458690821b2a575718f3505fcb812cf080c2c9e5c54b9af,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,0.05675959587097168,0.06282329559326172,0.06595087051391602,0.03479719161987305,0.05982851982116699,0.0624842643737793,0.06011247634887695,0.18968749046325684,0.1399698257446289,0.6380906105041504,0.56534743309021,0.07046627998352051,0.06940174102783203,0.07207489013671875,0.06595659255981445,0.06483650207519531 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1268,refs/remotes/origin/pull/11,bb4703104114664a8800674df2159429666c1863,ff80b1ebcd9bc61ee238da107f7baf770bca5251,8e399ff6a7b196f84ba3781b7d691eb5aaeba6d9,,True,True,True,26,88,1055.0,2,True,26,Tests_passed,accfbb20f0bf76789a82cca2a9556f1b625794272ebb0068fca02cc3b1fcc5ea,True,Tests_passed,18c5d3fe8edbba0e1dd4d46954a106f566e251c803ee17cf3f6f19a2e048aea1,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,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,40a1a65ce77b46d6708153dbff4dd4479b0b3888ae61a2038887b651903720bd,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,c1c098fd01968a37f9a14a56aa7f5783d26b4dd2f095faf62eff86eeb708cc9e,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Tests_passed,2333e3afb2966006d458690821b2a575718f3505fcb812cf080c2c9e5c54b9af,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,0.05675959587097168,0.06282329559326172,0.06595087051391602,0.03479719161987305,0.05982851982116699,0.0624842643737793,0.06011247634887695,0.18968749046325684,0.1399698257446289,0.6380906105041504,0.56534743309021,0.07046627998352051,0.06940174102783203,0.07207489013671875,0.06595659255981445,0.06483650207519531,0.06989622116088867,0.06914854049682617,0.06980419158935547,0.07171201705932617,0.06735754013061523,0.0691227912902832,0.07516717910766602,0.11226987838745117,0.12104415893554688,0.7011280059814453,0.6731398105621338,0.06350445747375488,0.06964516639709473,0.0681006908416748,0.0676727294921875,0.06890749931335449 diff --git a/results/combined/merges_timed/lwhite1/tablesaw.csv b/results/combined/merges_timed/lwhite1/tablesaw.csv index 28c95481b5..6ce3a7b9a6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,93fa43232f5966d094ca571d17f2f92a124f1ba48298c51542162f4b73adf762,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,a5e426a794ce64fee80e5160c51a904347f66fac039decaf53cd7584cd5ff2b8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.048371315002441406,0.04628753662109375,0.05490756034851074,0.017985105514526367,0.05663299560546875,0.056870222091674805,0.03991222381591797,0.29100465774536133,0.17363810539245605,1.5877776145935059,0.7871668338775635,0.04680490493774414,0.06679034233093262,0.047301530838012695,0.06529951095581055,0.06822919845581055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,93fa43232f5966d094ca571d17f2f92a124f1ba48298c51542162f4b73adf762,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,a5e426a794ce64fee80e5160c51a904347f66fac039decaf53cd7584cd5ff2b8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.048371315002441406,0.04628753662109375,0.05490756034851074,0.017985105514526367,0.05663299560546875,0.056870222091674805,0.03991222381591797,0.29100465774536133,0.17363810539245605,1.5877776145935059,0.7871668338775635,0.04680490493774414,0.06679034233093262,0.047301530838012695,0.06529951095581055,0.06822919845581055,0.06882810592651367,0.06731796264648438,0.06826353073120117,0.06766128540039062,0.06736922264099121,0.06753063201904297,0.06670999526977539,0.11768031120300293,0.12844610214233398,1.5492138862609863,0.8440766334533691,0.0663909912109375,0.0673680305480957,0.06778645515441895,0.06789374351501465,0.06881952285766602 diff --git a/results/combined/merges_timed/lyncode/xoai.csv b/results/combined/merges_timed/lyncode/xoai.csv index 982c1cf1f7..e92397156e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,True,39,102,801,3,True,39,Tests_passed,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,True,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,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,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_failed,0583b909b57a43df76fd88da55a29848f7c2bcb3d52095afc269a5ab1b280e81,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,0.018093585968017578,0.04619288444519043,0.05799221992492676,0.0453488826751709,0.04969906806945801,0.03796195983886719,0.06113314628601074,0.25501251220703125,0.18203163146972656,0.04405951499938965,0.596013069152832,0.04138636589050293,0.08268260955810547,0.04118514060974121,0.11463308334350586,0.127516508102417 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,True,39,102,801,3,True,39,Tests_passed,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,True,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,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,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_failed,0583b909b57a43df76fd88da55a29848f7c2bcb3d52095afc269a5ab1b280e81,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,0.018093585968017578,0.04619288444519043,0.05799221992492676,0.0453488826751709,0.04969906806945801,0.03796195983886719,0.06113314628601074,0.25501251220703125,0.18203163146972656,0.04405951499938965,0.596013069152832,0.04138636589050293,0.08268260955810547,0.04118514060974121,0.11463308334350586,0.127516508102417,0.1077125072479248,0.1192941665649414,0.13085293769836426,0.13135719299316406,0.08250784873962402,0.0822594165802002,0.08505010604858398,0.16425848007202148,0.1527397632598877,0.12028908729553223,0.6494550704956055,0.08126020431518555,0.08194804191589355,0.12549972534179688,0.12519478797912598,0.12352204322814941 diff --git a/results/combined/merges_timed/lyogavin/pistachio.csv b/results/combined/merges_timed/lyogavin/pistachio.csv index 96448b5149..06ba9fabb2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,True,True,Tests_passed,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,True,7,29,200,2,True,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,True,7,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,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,2515d156a4fd61da37c89dbe992d56ad38a3cafd91138706a3626aa5a32d7932,Tests_failed,35e209530e082dc5e2ce268968ef9b4c46ec79b2da0fc5be0c2e1c6e33ad62c1,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,0.03882908821105957,0.035115957260131836,0.04642009735107422,0.05357193946838379,0.04412984848022461,0.04879045486450195,0.04467344284057617,0.15660738945007324,0.11403727531433105,1.228060245513916,0.44251346588134766,0.09298110008239746,0.11802554130554199,0.08858227729797363,0.12604761123657227,0.12100791931152344 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,True,True,Tests_passed,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,True,7,29,200,2,True,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,True,7,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,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,2515d156a4fd61da37c89dbe992d56ad38a3cafd91138706a3626aa5a32d7932,Tests_failed,35e209530e082dc5e2ce268968ef9b4c46ec79b2da0fc5be0c2e1c6e33ad62c1,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,Tests_passed,4acbb9788d0bd5c778c1a82fba4f12827b3b2e540dd053356d058cb8541d5687,0.03882908821105957,0.035115957260131836,0.04642009735107422,0.05357193946838379,0.04412984848022461,0.04879045486450195,0.04467344284057617,0.15660738945007324,0.11403727531433105,1.228060245513916,0.44251346588134766,0.09298110008239746,0.11802554130554199,0.08858227729797363,0.12604761123657227,0.12100791931152344,0.12361335754394531,0.1206967830657959,0.10632753372192383,0.1315138339996338,0.1374678611755371,0.1284785270690918,0.13053011894226074,0.1871654987335205,0.14026713371276855,1.3187220096588135,0.4781649112701416,0.12072610855102539,0.12003612518310547,0.11747503280639648,0.12407064437866211,0.12216973304748535 diff --git a/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv b/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv index ec9dad67c6..8b6303431f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,True,8,17,89,2,True,10,Tests_passed,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,True,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,True,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,f0af379c54456d89cbcf1d5e44f545ddc905761a9a5a0b58525353c484d6302e,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,4d56e71996fc6f9086373994b01ca5c9c94e233ac9435158f733eed7777bf0f7,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,eb83d38e37c95ae99be21b542875295651536bb7f039e61b9d27164b6b36f18e,Tests_failed,141388646aaafc5c0406e4993d95e55b99e4e63d8e8e118507179bb453f3d269,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,0.04538273811340332,0.04154062271118164,0.040235280990600586,0.014980316162109375,0.037619590759277344,0.04114222526550293,0.04457736015319824,0.15456867218017578,0.11895298957824707,0.688096284866333,0.28806519508361816,0.04045414924621582,0.04268956184387207,0.041304588317871094,0.043196916580200195,0.044164419174194336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,True,8,17,89,2,True,10,Tests_passed,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,True,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,True,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,f0af379c54456d89cbcf1d5e44f545ddc905761a9a5a0b58525353c484d6302e,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,4d56e71996fc6f9086373994b01ca5c9c94e233ac9435158f733eed7777bf0f7,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,eb83d38e37c95ae99be21b542875295651536bb7f039e61b9d27164b6b36f18e,Tests_failed,141388646aaafc5c0406e4993d95e55b99e4e63d8e8e118507179bb453f3d269,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,0.04538273811340332,0.04154062271118164,0.040235280990600586,0.014980316162109375,0.037619590759277344,0.04114222526550293,0.04457736015319824,0.15456867218017578,0.11895298957824707,0.688096284866333,0.28806519508361816,0.04045414924621582,0.04268956184387207,0.041304588317871094,0.043196916580200195,0.044164419174194336,0.04243302345275879,0.04178309440612793,0.041555166244506836,0.04179263114929199,0.04122138023376465,0.04147744178771973,0.04130744934082031,0.07212591171264648,0.07495713233947754,0.6805155277252197,0.35593390464782715,0.041962385177612305,0.04178047180175781,0.040970563888549805,0.04070711135864258,0.041295528411865234 diff --git a/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv b/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv index 6caf49241a..1fe6167a36 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,True,6,40,179,3,True,6,Tests_passed,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,True,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,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_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,541b3735ca739c3ceb3ce93d8c77adefe2ca92eae4f3cdeebd8400fcabc7d31a,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,0.04467344284057617,0.04408454895019531,0.046869754791259766,0.018661022186279297,0.049620628356933594,0.048217058181762695,0.04172515869140625,0.22690582275390625,0.17677879333496094,1.977637529373169,0.5699880123138428,0.033782958984375,0.07927465438842773,0.0320584774017334,0.08156347274780273,0.0803830623626709 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,True,6,40,179,3,True,6,Tests_passed,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,True,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,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_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,541b3735ca739c3ceb3ce93d8c77adefe2ca92eae4f3cdeebd8400fcabc7d31a,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,8ee31278a4eb87392c7086830a9e241b6d63a55c8f7f217d1403b005efb17974,Tests_passed,4ee42f8b5fe686cd4922515f18fa932e6bb8c3b6fae17cdaf66b654dee6db3d4,0.04467344284057617,0.04408454895019531,0.046869754791259766,0.018661022186279297,0.049620628356933594,0.048217058181762695,0.04172515869140625,0.22690582275390625,0.17677879333496094,1.977637529373169,0.5699880123138428,0.033782958984375,0.07927465438842773,0.0320584774017334,0.08156347274780273,0.0803830623626709,0.07912707328796387,0.08388018608093262,0.08133387565612793,0.08254075050354004,0.08175373077392578,0.0816502571105957,0.07907819747924805,0.13204216957092285,0.13635039329528809,2.2840893268585205,0.677497148513794,0.08261919021606445,0.08077597618103027,0.0824129581451416,0.08033895492553711,0.0838463306427002 diff --git a/results/combined/merges_timed/magro/kryo-serializers.csv b/results/combined/merges_timed/magro/kryo-serializers.csv index cf02efd672..ebed209aeb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,True,5,29,199,2,True,5,Tests_passed,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,True,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,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,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,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,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,222fb7686e4a7dedba7afdd78c699bd952abe494823fada2e6a665977cb21a81,Tests_failed,e4c4c1d80d44af979d55cc09e4c56b46e636436701b441733f7a0a19c52851ab,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,0.05600309371948242,0.04401969909667969,0.03910112380981445,0.021841764450073242,0.046304941177368164,0.06713700294494629,0.049036264419555664,0.17649102210998535,0.12017488479614258,0.6558918952941895,0.4716911315917969,0.03980422019958496,0.0662226676940918,0.04050421714782715,0.06345391273498535,0.06611943244934082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,True,5,29,199,2,True,5,Tests_passed,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,True,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,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,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,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,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,222fb7686e4a7dedba7afdd78c699bd952abe494823fada2e6a665977cb21a81,Tests_failed,e4c4c1d80d44af979d55cc09e4c56b46e636436701b441733f7a0a19c52851ab,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,0.05600309371948242,0.04401969909667969,0.03910112380981445,0.021841764450073242,0.046304941177368164,0.06713700294494629,0.049036264419555664,0.17649102210998535,0.12017488479614258,0.6558918952941895,0.4716911315917969,0.03980422019958496,0.0662226676940918,0.04050421714782715,0.06345391273498535,0.06611943244934082,0.06035304069519043,0.060703277587890625,0.06453514099121094,0.06523513793945312,0.06462407112121582,0.06319022178649902,0.06461954116821289,0.09532332420349121,0.09129452705383301,0.7074854373931885,0.5043096542358398,0.06139397621154785,0.06318521499633789,0.06157636642456055,0.06273365020751953,0.06273770332336426 diff --git a/results/combined/merges_timed/mahoney/slf4j-test.csv b/results/combined/merges_timed/mahoney/slf4j-test.csv index 02096e2053..1a54ff50aa 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,True,True,Tests_passed,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,True,15,54,140,6,True,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,True,15,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,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,9d5eff2479ed12a6df638a75fd9fd920f22e923c02f4bfcb8ed8b250088c7ac9,Merge_failed,071f8575c114ccf4003895bc79c5216f282d41dd41de8427fdaaec3ee3b60e89,Merge_failed,e497a9b380e092840beaa08f1f7f3008f44baf4d6989cbca8394f4bfbf3169fe,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,0.04391622543334961,0.02944159507751465,0.02807784080505371,0.015729188919067383,0.026648283004760742,0.03947257995605469,0.03449368476867676,0.315645694732666,0.33276987075805664,5.046327829360962,0.5025222301483154,0.04085874557495117,0.12534165382385254,0.04137825965881348,0.12482118606567383,0.12425875663757324 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,True,True,Tests_passed,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,True,15,54,140,6,True,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,True,15,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,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,9d5eff2479ed12a6df638a75fd9fd920f22e923c02f4bfcb8ed8b250088c7ac9,Merge_failed,071f8575c114ccf4003895bc79c5216f282d41dd41de8427fdaaec3ee3b60e89,Merge_failed,e497a9b380e092840beaa08f1f7f3008f44baf4d6989cbca8394f4bfbf3169fe,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,Merge_failed,dc8f37d750dc81274b774cd6ae8397d262ef2493778bedee8eb007a43feeba79,0.04391622543334961,0.02944159507751465,0.02807784080505371,0.015729188919067383,0.026648283004760742,0.03947257995605469,0.03449368476867676,0.315645694732666,0.33276987075805664,5.046327829360962,0.5025222301483154,0.04085874557495117,0.12534165382385254,0.04137825965881348,0.12482118606567383,0.12425875663757324,0.11389422416687012,0.11541152000427246,0.11633443832397461,0.11690282821655273,0.11882901191711426,0.11574339866638184,0.11872458457946777,0.21486949920654297,0.2452092170715332,4.74986720085144,0.6223475933074951,0.1178431510925293,0.11552619934082031,0.11657071113586426,0.11592745780944824,0.11416435241699219 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 a5ab15fb55..fcec01037f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,True,9,61,240.0,2,True,9,Tests_passed,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,True,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,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,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Tests_passed,574e38f5579f40d6889c69c5d834acc04ebb81892202c327cff4ecf137ace655,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,746dceaa41335626e9b6f22a079f45d68f62697c002d3c8f8ced8032a7c08f07,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,bde74d030daad468fe701d574c0bf396fbc54a232158e6235878cbd1e13e4ed1,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,0.0607905387878418,0.05879640579223633,0.07421278953552246,0.04172539710998535,0.012754440307617188,0.06969380378723145,0.0705568790435791,0.21179986000061035,0.08249711990356445,1.3066048622131348,0.7160389423370361,0.16243386268615723,0.11328887939453125,0.12337374687194824,0.0864100456237793,0.10646772384643555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,True,9,61,240.0,2,True,9,Tests_passed,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,True,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,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,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Tests_passed,574e38f5579f40d6889c69c5d834acc04ebb81892202c327cff4ecf137ace655,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,746dceaa41335626e9b6f22a079f45d68f62697c002d3c8f8ced8032a7c08f07,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,bde74d030daad468fe701d574c0bf396fbc54a232158e6235878cbd1e13e4ed1,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,0.0607905387878418,0.05879640579223633,0.07421278953552246,0.04172539710998535,0.012754440307617188,0.06969380378723145,0.0705568790435791,0.21179986000061035,0.08249711990356445,1.3066048622131348,0.7160389423370361,0.16243386268615723,0.11328887939453125,0.12337374687194824,0.0864100456237793,0.10646772384643555,0.10677742958068848,0.10767388343811035,0.044530391693115234,0.1192941665649414,0.12166094779968262,0.12028789520263672,0.07270646095275879,0.1491539478302002,0.17469286918640137,1.3615672588348389,0.7891025543212891,0.10998058319091797,0.10533905029296875,0.10620903968811035,0.06862235069274902,0.11029696464538574 diff --git a/results/combined/merges_timed/mangstadt/ez-vcard.csv b/results/combined/merges_timed/mangstadt/ez-vcard.csv index 7a3a06fcbd..6933a29586 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,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,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_failed,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,0.04158449172973633,0.04814767837524414,0.05866360664367676,0.05173993110656738,0.0658559799194336,0.07129144668579102,0.07176733016967773,0.7076160907745361,0.541736364364624,6.070753812789917,6.007279634475708,0.07630109786987305,0.28678202629089355,0.0806732177734375,0.2728850841522217,0.2848517894744873 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,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,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_failed,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,0.04158449172973633,0.04814767837524414,0.05866360664367676,0.05173993110656738,0.0658559799194336,0.07129144668579102,0.07176733016967773,0.7076160907745361,0.541736364364624,6.070753812789917,6.007279634475708,0.07630109786987305,0.28678202629089355,0.0806732177734375,0.2728850841522217,0.2848517894744873,0.2791786193847656,0.29113149642944336,0.29607439041137695,0.3035721778869629,0.2948184013366699,0.2932415008544922,0.29348206520080566,0.5014867782592773,0.5129194259643555,6.312601327896118,6.334683895111084,0.2865593433380127,0.2915768623352051,0.28853654861450195,0.2850971221923828,0.2925572395324707 diff --git a/results/combined/merges_timed/maoo/maven-tiles.csv b/results/combined/merges_timed/maoo/maven-tiles.csv index 36c2c5944e..24b2b2b75c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,True,27,48,1000,2,True,27,Tests_passed,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,True,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,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_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,dc3468d82e2131bf17936a3bbebbb30a73d3aca137f4636af185377707df1c2d,Tests_failed,e925c02db99d6cf99a44c6a2c8deeadfe2f01117d6ac4d6dccaabda81cabf13f,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,0.010893106460571289,0.010938882827758789,0.01184701919555664,0.017086505889892578,0.011806249618530273,0.011827707290649414,0.011629819869995117,0.036752939224243164,0.0689089298248291,0.6472947597503662,0.3796358108520508,0.031244754791259766,0.05825352668762207,0.03244948387145996,0.05803394317626953,0.0575566291809082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,True,27,48,1000,2,True,27,Tests_passed,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,True,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,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_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,dc3468d82e2131bf17936a3bbebbb30a73d3aca137f4636af185377707df1c2d,Tests_failed,e925c02db99d6cf99a44c6a2c8deeadfe2f01117d6ac4d6dccaabda81cabf13f,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,Tests_passed,ce17944b4dda699c1620cc308c28e655c5db12a9e645d9df0c6ea56c237a4821,0.010893106460571289,0.010938882827758789,0.01184701919555664,0.017086505889892578,0.011806249618530273,0.011827707290649414,0.011629819869995117,0.036752939224243164,0.0689089298248291,0.6472947597503662,0.3796358108520508,0.031244754791259766,0.05825352668762207,0.03244948387145996,0.05803394317626953,0.0575566291809082,0.0543820858001709,0.0559542179107666,0.055643558502197266,0.05746030807495117,0.05714893341064453,0.05723762512207031,0.05716276168823242,0.08833765983581543,0.08641648292541504,0.6553950309753418,0.39867138862609863,0.05603361129760742,0.056382179260253906,0.0550990104675293,0.05694913864135742,0.054921865463256836 diff --git a/results/combined/merges_timed/marginallyclever/makelangelo.csv b/results/combined/merges_timed/marginallyclever/makelangelo.csv index f3942f884c..dceaccf1e7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,True,51.0,270,2034.0,4,True,52,Tests_passed,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,True,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,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,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Tests_passed,b618fc0b8d4542a7e6809c07d4c9f69deced167e73f7eb21d039e2d6860c81b9,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,ceb595663eb082e4b9e09019f71b1a48486056ce4cbb83582d8f505009221b63,Tests_passed,e938f270352030c3f5a92ae61540641711bef6bb8614df0ed81fc2901175fc3f,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Tests_failed,ae4e0521beb60733275f1963c9c7557dc3fd82f1884afbb98e16f35abcce0f4d,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,0.16118693351745605,0.16203022003173828,0.19755220413208008,0.22338318824768066,0.19617056846618652,0.19744300842285156,0.19742035865783691,0.38646984100341797,0.3678762912750244,0.16341614723205566,2.758863925933838,0.44826579093933105,0.3361697196960449,0.30164504051208496,0.28734803199768066,0.3370535373687744 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,True,51.0,270,2034.0,4,True,52,Tests_passed,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,True,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,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,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Tests_passed,b618fc0b8d4542a7e6809c07d4c9f69deced167e73f7eb21d039e2d6860c81b9,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,ceb595663eb082e4b9e09019f71b1a48486056ce4cbb83582d8f505009221b63,Tests_passed,e938f270352030c3f5a92ae61540641711bef6bb8614df0ed81fc2901175fc3f,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Tests_failed,ae4e0521beb60733275f1963c9c7557dc3fd82f1884afbb98e16f35abcce0f4d,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,53df807200d2a0b5b8e59727a91448208247eb532de5a9270e3c5d1484071cbb,Merge_failed,bf2089d2c79eb1a601c661a1b3f49047162c7fd38d5d36d35b5198b994a70aa8,0.16118693351745605,0.16203022003173828,0.19755220413208008,0.22338318824768066,0.19617056846618652,0.19744300842285156,0.19742035865783691,0.38646984100341797,0.3678762912750244,0.16341614723205566,2.758863925933838,0.44826579093933105,0.3361697196960449,0.30164504051208496,0.28734803199768066,0.3370535373687744,0.3285698890686035,0.33460283279418945,0.32912683486938477,0.36332154273986816,0.36893606185913086,0.3728659152984619,0.36458897590637207,0.5089054107666016,0.5917353630065918,0.34482288360595703,2.818560838699341,0.3222348690032959,0.3274099826812744,0.2852153778076172,0.2875685691833496,0.28818368911743164 diff --git a/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv b/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv index cb344fdd59..a15b9ef0d2 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,False,Tests_passed,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,True,3,20,55.0,2,True,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,True,3,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,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,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,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,e7edcea0d9323d537c7d6b62c092fe8f4d2177d9de6f89f1665bec7003c1af76,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,0.013731718063354492,0.038069725036621094,0.04551553726196289,0.01941704750061035,0.018593549728393555,0.014763116836547852,0.05637550354003906,0.1608738899230957,0.11301279067993164,0.756047248840332,0.3085160255432129,0.03881049156188965,0.06122136116027832,0.038278818130493164,0.06029915809631348,0.0604703426361084 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,False,Tests_passed,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,True,3,20,55.0,2,True,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,True,3,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,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,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,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,e7edcea0d9323d537c7d6b62c092fe8f4d2177d9de6f89f1665bec7003c1af76,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,0.013731718063354492,0.038069725036621094,0.04551553726196289,0.01941704750061035,0.018593549728393555,0.014763116836547852,0.05637550354003906,0.1608738899230957,0.11301279067993164,0.756047248840332,0.3085160255432129,0.03881049156188965,0.06122136116027832,0.038278818130493164,0.06029915809631348,0.0604703426361084,0.0574796199798584,0.05879068374633789,0.060738325119018555,0.06192469596862793,0.061270952224731445,0.06023240089416504,0.059287309646606445,0.09489083290100098,0.08896327018737793,0.8031554222106934,0.3406798839569092,0.060194969177246094,0.05871129035949707,0.05634284019470215,0.05824899673461914,0.0572667121887207 diff --git a/results/combined/merges_timed/marschall/memoryfilesystem.csv b/results/combined/merges_timed/marschall/memoryfilesystem.csv index 77435dedff..0ac36ce240 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,True,8,15,363,3,True,8,Tests_passed,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,True,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,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,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,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,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,2c3c5bb7302314cbe8b3c1ab08dc5d68dde4e34e17aa3ac1c0a49de900b72e35,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,0.014387130737304688,0.014564275741577148,0.016237735748291016,0.023775339126586914,0.016165494918823242,0.016065597534179688,0.01610541343688965,0.054817914962768555,0.12262868881225586,4.513042211532593,0.8215842247009277,0.042756080627441406,0.10093331336975098,0.04160594940185547,0.10262274742126465,0.10237336158752441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,True,8,15,363,3,True,8,Tests_passed,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,True,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,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,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,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,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,2c3c5bb7302314cbe8b3c1ab08dc5d68dde4e34e17aa3ac1c0a49de900b72e35,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,0.014387130737304688,0.014564275741577148,0.016237735748291016,0.023775339126586914,0.016165494918823242,0.016065597534179688,0.01610541343688965,0.054817914962768555,0.12262868881225586,4.513042211532593,0.8215842247009277,0.042756080627441406,0.10093331336975098,0.04160594940185547,0.10262274742126465,0.10237336158752441,0.09854960441589355,0.10107159614562988,0.09824419021606445,0.10166311264038086,0.08631420135498047,0.09788346290588379,0.0923163890838623,0.15496158599853516,0.15634441375732422,4.853518009185791,0.863306999206543,0.09581208229064941,0.09727907180786133,0.089813232421875,0.09848237037658691,0.09614872932434082 diff --git a/results/combined/merges_timed/martinpaljak/globalplatformpro.csv b/results/combined/merges_timed/martinpaljak/globalplatformpro.csv index 2b40d79a44..242f2f9ce4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,Tests_passed,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,True,21,90,390,3,True,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,True,21,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,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Tests_failed,790e32dce17baa1c71a568689ccd34a20ecb938f7c2b4cabcf17171d7a235ebe,Tests_passed,abaa9c104d9ff2fd3fa6a437b5ea772158fc2c5fcfe3e32b1fbcf55b95d957d4,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,6e1198d8b7df21d4f78cf5486d5031596777e224a172c7786b2b14cf40d60fde,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,65ea3cfc99ee1001e827adfe490f176aed968df67df8deb01aea7e5c8dca2628,Tests_failed,bb5e4450b826ee7c9689ffc985053860e768c5648be6be77b7e2e3f7a0723dfc,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,0.0726621150970459,0.0724024772644043,0.08779096603393555,0.10427117347717285,0.08854389190673828,0.08743143081665039,0.08709883689880371,0.16604161262512207,0.18637633323669434,2.2943496704101562,0.8747918605804443,0.21218657493591309,0.12174487113952637,0.15291881561279297,0.165816068649292,0.17479991912841797 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,Tests_passed,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,True,21,90,390,3,True,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,True,21,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,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Tests_failed,790e32dce17baa1c71a568689ccd34a20ecb938f7c2b4cabcf17171d7a235ebe,Tests_passed,abaa9c104d9ff2fd3fa6a437b5ea772158fc2c5fcfe3e32b1fbcf55b95d957d4,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,6e1198d8b7df21d4f78cf5486d5031596777e224a172c7786b2b14cf40d60fde,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,65ea3cfc99ee1001e827adfe490f176aed968df67df8deb01aea7e5c8dca2628,Tests_failed,bb5e4450b826ee7c9689ffc985053860e768c5648be6be77b7e2e3f7a0723dfc,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,0.0726621150970459,0.0724024772644043,0.08779096603393555,0.10427117347717285,0.08854389190673828,0.08743143081665039,0.08709883689880371,0.16604161262512207,0.18637633323669434,2.2943496704101562,0.8747918605804443,0.21218657493591309,0.12174487113952637,0.15291881561279297,0.165816068649292,0.17479991912841797,0.1846916675567627,0.17271661758422852,0.16489815711975098,0.18691635131835938,0.1255176067352295,0.1942145824432373,0.10083961486816406,0.2794668674468994,0.13668060302734375,2.807734489440918,1.0659725666046143,0.1721794605255127,0.1800098419189453,0.18032598495483398,0.14889049530029297,0.18232464790344238 diff --git a/results/combined/merges_timed/martylamb/nailgun.csv b/results/combined/merges_timed/martylamb/nailgun.csv index 588f2b052c..68f1d5fed4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,False,True,3,17,202,2,True,3,Tests_passed,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,True,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,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,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,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,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,90242f7a38b063044129c9baa6b2f96d25c89373c124b49b2512070a4572e8e5,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,0.04232430458068848,0.04249167442321777,0.0425877571105957,0.016895532608032227,0.042207956314086914,0.03857088088989258,0.044997453689575195,0.16165518760681152,0.10852479934692383,0.8570370674133301,0.3142726421356201,0.032279253005981445,0.05776667594909668,0.03361082077026367,0.05894017219543457,0.057615041732788086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,False,True,3,17,202,2,True,3,Tests_passed,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,True,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,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,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,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,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,90242f7a38b063044129c9baa6b2f96d25c89373c124b49b2512070a4572e8e5,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,0.04232430458068848,0.04249167442321777,0.0425877571105957,0.016895532608032227,0.042207956314086914,0.03857088088989258,0.044997453689575195,0.16165518760681152,0.10852479934692383,0.8570370674133301,0.3142726421356201,0.032279253005981445,0.05776667594909668,0.03361082077026367,0.05894017219543457,0.057615041732788086,0.05551028251647949,0.0557551383972168,0.05753755569458008,0.056839942932128906,0.058420419692993164,0.057489633560180664,0.0567317008972168,0.09017300605773926,0.0888223648071289,0.8670721054077148,0.3229358196258545,0.05591106414794922,0.055869102478027344,0.05756521224975586,0.055031776428222656,0.055242061614990234 diff --git a/results/combined/merges_timed/mashape/unirest-java.csv b/results/combined/merges_timed/mashape/unirest-java.csv index b3e15fd590..d7d5676d5e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,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,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,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,db500a00092ada6b9c970afed19abcbc3853fba79ce1a1d988c394d134634d2e,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,0.04461789131164551,0.04957842826843262,0.04445624351501465,0.017061233520507812,0.04918169975280762,0.046738624572753906,0.04153919219970703,0.17164087295532227,0.11038875579833984,1.0721900463104248,0.3944985866546631,0.03154945373535156,0.05800223350524902,0.03201937675476074,0.05732274055480957,0.057172536849975586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,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,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,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,db500a00092ada6b9c970afed19abcbc3853fba79ce1a1d988c394d134634d2e,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,0.04461789131164551,0.04957842826843262,0.04445624351501465,0.017061233520507812,0.04918169975280762,0.046738624572753906,0.04153919219970703,0.17164087295532227,0.11038875579833984,1.0721900463104248,0.3944985866546631,0.03154945373535156,0.05800223350524902,0.03201937675476074,0.05732274055480957,0.057172536849975586,0.0554049015045166,0.05651354789733887,0.0552668571472168,0.05703544616699219,0.055130958557128906,0.05581855773925781,0.05597877502441406,0.08753418922424316,0.08452463150024414,1.1001355648040771,0.42569780349731445,0.056166648864746094,0.05578875541687012,0.056740522384643555,0.05581831932067871,0.05522561073303223 diff --git a/results/combined/merges_timed/masterthought/cucumber-reporting.csv b/results/combined/merges_timed/masterthought/cucumber-reporting.csv index 9f55ca091f..f7cfe4bc6a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,Tests_passed,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,True,65,212,3842,3,True,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,True,65,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,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,2615e7b8257e2f3bc4e0972dfa1cf7b320736c76a473edbe64e369bff797d257,Tests_failed,7a0204d0b83d19b3af5afb268d07324bd8441341aa1839e99d79960c31a8c7df,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,0.01889801025390625,0.020113229751586914,0.0406343936920166,0.019092082977294922,0.05425572395324707,0.02560877799987793,0.03447985649108887,0.1975998878479004,0.16142559051513672,1.2479982376098633,0.7950639724731445,0.0655825138092041,0.11817288398742676,0.06842994689941406,0.11656451225280762,0.11919403076171875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,Tests_passed,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,True,65,212,3842,3,True,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,True,65,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,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,2615e7b8257e2f3bc4e0972dfa1cf7b320736c76a473edbe64e369bff797d257,Tests_failed,7a0204d0b83d19b3af5afb268d07324bd8441341aa1839e99d79960c31a8c7df,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,141e85aa98da025f5f9d5bfde6cf2d13c93d387ff53d459d7d2fa29723c9be39,0.01889801025390625,0.020113229751586914,0.0406343936920166,0.019092082977294922,0.05425572395324707,0.02560877799987793,0.03447985649108887,0.1975998878479004,0.16142559051513672,1.2479982376098633,0.7950639724731445,0.0655825138092041,0.11817288398742676,0.06842994689941406,0.11656451225280762,0.11919403076171875,0.11114668846130371,0.08744692802429199,0.11745715141296387,0.12071442604064941,0.11826395988464355,0.12170791625976562,0.11753439903259277,0.17008662223815918,0.1575026512145996,1.2872583866119385,0.8363821506500244,0.10907530784606934,0.11336421966552734,0.1097867488861084,0.10939764976501465,0.10904216766357422 diff --git a/results/combined/merges_timed/matthias247/jawampa.csv b/results/combined/merges_timed/matthias247/jawampa.csv index 521689264c..7b96d8d6ca 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,Tests_passed,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,True,8,65,255,3,True,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,True,8,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,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,b4b0ad303a156ef0f44587f4c4112c3a35b630ab6ac53742642dc8349f712a6d,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,d880b4fca63b6a0ce32e236cef9634fed80a842b8d2190b06c80d309067e47de,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,0.04606318473815918,0.012862682342529297,0.051427364349365234,0.016973257064819336,0.04097270965576172,0.04440164566040039,0.053426265716552734,0.24523472785949707,0.1783289909362793,3.3546664714813232,0.634577751159668,0.04600691795349121,0.07424545288085938,0.04528689384460449,0.07639741897583008,0.07338261604309082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,Tests_passed,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,True,8,65,255,3,True,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,True,8,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,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,b4b0ad303a156ef0f44587f4c4112c3a35b630ab6ac53742642dc8349f712a6d,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,d880b4fca63b6a0ce32e236cef9634fed80a842b8d2190b06c80d309067e47de,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,0.04606318473815918,0.012862682342529297,0.051427364349365234,0.016973257064819336,0.04097270965576172,0.04440164566040039,0.053426265716552734,0.24523472785949707,0.1783289909362793,3.3546664714813232,0.634577751159668,0.04600691795349121,0.07424545288085938,0.04528689384460449,0.07639741897583008,0.07338261604309082,0.0741732120513916,0.07440018653869629,0.07759785652160645,0.07728242874145508,0.0785675048828125,0.07546591758728027,0.07608866691589355,0.13147425651550293,0.1338052749633789,3.6840834617614746,0.7889952659606934,0.07383942604064941,0.07515120506286621,0.07812070846557617,0.07526278495788574,0.0749053955078125 diff --git a/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv b/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv index 41df2c36a7..dfe2681c1f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,Tests_passed,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,True,48,45,9471,5,True,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,True,50,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,fe3c138e224216ed7f31b00b2258e106a56839982cf84b9f9f0bae3276c94a56,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,0.08026385307312012,0.06920313835144043,0.0844724178314209,0.06161785125732422,0.0913548469543457,0.07898855209350586,0.07948088645935059,0.36171483993530273,0.19008755683898926,5.288080453872681,1.1177008152008057,76.93375968933105,0.1094810962677002,0.25882554054260254,0.40137362480163574,0.16761541366577148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,Tests_passed,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,True,48,45,9471,5,True,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,True,50,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,fe3c138e224216ed7f31b00b2258e106a56839982cf84b9f9f0bae3276c94a56,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,0.08026385307312012,0.06920313835144043,0.0844724178314209,0.06161785125732422,0.0913548469543457,0.07898855209350586,0.07948088645935059,0.36171483993530273,0.19008755683898926,5.288080453872681,1.1177008152008057,76.93375968933105,0.1094810962677002,0.25882554054260254,0.40137362480163574,0.16761541366577148,0.3954014778137207,0.15322113037109375,0.40413928031921387,0.15602731704711914,0.4023106098175049,0.409928560256958,0.40064024925231934,0.49225902557373047,0.4799692630767822,5.342370271682739,1.4724128246307373,0.3988955020904541,0.3975718021392822,0.4039444923400879,0.403087854385376,0.15711688995361328 diff --git a/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv b/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv index 095c8ada61..d00a90e3a4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,True,5,8,43.0,2,True,5,Tests_passed,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,True,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,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,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,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,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a9c47a0769fac3a1173aaa00567b68277a14b0dea9bc68bd0484b2137317fc9,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,0.06163668632507324,0.05650138854980469,0.06691169738769531,0.020198345184326172,0.06556940078735352,0.06675314903259277,0.06267762184143066,0.1832571029663086,0.12274503707885742,1.6245324611663818,0.5328538417816162,0.03880786895751953,0.0722658634185791,0.041260719299316406,0.0761864185333252,0.07455897331237793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,True,5,8,43.0,2,True,5,Tests_passed,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,True,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,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,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,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,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a9c47a0769fac3a1173aaa00567b68277a14b0dea9bc68bd0484b2137317fc9,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,0.06163668632507324,0.05650138854980469,0.06691169738769531,0.020198345184326172,0.06556940078735352,0.06675314903259277,0.06267762184143066,0.1832571029663086,0.12274503707885742,1.6245324611663818,0.5328538417816162,0.03880786895751953,0.0722658634185791,0.041260719299316406,0.0761864185333252,0.07455897331237793,0.07084417343139648,0.07409858703613281,0.07369732856750488,0.0719759464263916,0.07497835159301758,0.0706031322479248,0.07248616218566895,0.11076974868774414,0.10614585876464844,1.5745909214019775,0.5580408573150635,0.0717461109161377,0.0731954574584961,0.07097291946411133,0.07209467887878418,0.07071733474731445 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 b65f58cfe8..a4479cc907 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,True,14,27,395.0,2,True,14,Tests_passed,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,True,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,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,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_failed,4120d4c8f46b0b62418d1bf1784257c44332b876fa1134dfcf49698bace7504f,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,0.04130244255065918,0.061505794525146484,0.06556916236877441,0.021356821060180664,0.06110334396362305,0.04724931716918945,0.061189889907836914,0.1894514560699463,0.11645293235778809,0.041143178939819336,0.5982513427734375,0.04534482955932617,0.06915092468261719,0.044684410095214844,0.07042312622070312,0.07159090042114258 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,True,14,27,395.0,2,True,14,Tests_passed,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,True,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,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,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_failed,4120d4c8f46b0b62418d1bf1784257c44332b876fa1134dfcf49698bace7504f,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,0.04130244255065918,0.061505794525146484,0.06556916236877441,0.021356821060180664,0.06110334396362305,0.04724931716918945,0.061189889907836914,0.1894514560699463,0.11645293235778809,0.041143178939819336,0.5982513427734375,0.04534482955932617,0.06915092468261719,0.044684410095214844,0.07042312622070312,0.07159090042114258,0.06729793548583984,0.06766080856323242,0.07094383239746094,0.06778216361999512,0.06623697280883789,0.0663609504699707,0.07121539115905762,0.10562586784362793,0.09808778762817383,0.08110642433166504,0.6344289779663086,0.06652355194091797,0.06769776344299316,0.06705045700073242,0.06611943244934082,0.06708478927612305 diff --git a/results/combined/merges_timed/mavocz/smscsim.csv b/results/combined/merges_timed/mavocz/smscsim.csv index 9036c8a03c..102cecde7b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,True,4,14,146,5,True,6,Tests_passed,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,True,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,True,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d9235f7714e96af4e1063fc2fdcdec40de03f5ad1a6ade10252dc6f8325c9f29,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Tests_failed,509d46f6232d2468f194b7bc60032bdebb3c17e75440f32db3fc87ad2a9ffa10,Merge_failed,78669896b8dfdeac2554befb618eae1360ec9054143ca6e78f313955d7a1a930,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d6f84800df6513e7984c069eae3170ac551dba21973146add9d0b44f5f7bcbc9,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,580ebdbe0443ff667c6fe688773c18ccaf8c758ec5800ed178ca3895a92878c0,Tests_failed,f45566867899bbc415c415e0507cc798d6d714801190abc80d13deabf5e0d7f8,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,0.043807268142700195,0.03814411163330078,0.03700423240661621,0.0146484375,0.03444814682006836,0.0338134765625,0.03259015083312988,0.22870159149169922,0.17954540252685547,1.4502811431884766,0.39189934730529785,0.05578494071960449,0.05517148971557617,0.05285286903381348,0.08044147491455078,0.07592511177062988 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,True,4,14,146,5,True,6,Tests_passed,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,True,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,True,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d9235f7714e96af4e1063fc2fdcdec40de03f5ad1a6ade10252dc6f8325c9f29,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Tests_failed,509d46f6232d2468f194b7bc60032bdebb3c17e75440f32db3fc87ad2a9ffa10,Merge_failed,78669896b8dfdeac2554befb618eae1360ec9054143ca6e78f313955d7a1a930,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d6f84800df6513e7984c069eae3170ac551dba21973146add9d0b44f5f7bcbc9,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,580ebdbe0443ff667c6fe688773c18ccaf8c758ec5800ed178ca3895a92878c0,Tests_failed,f45566867899bbc415c415e0507cc798d6d714801190abc80d13deabf5e0d7f8,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,0.043807268142700195,0.03814411163330078,0.03700423240661621,0.0146484375,0.03444814682006836,0.0338134765625,0.03259015083312988,0.22870159149169922,0.17954540252685547,1.4502811431884766,0.39189934730529785,0.05578494071960449,0.05517148971557617,0.05285286903381348,0.08044147491455078,0.07592511177062988,0.07616114616394043,0.07716584205627441,0.07591485977172852,0.08022427558898926,0.07560324668884277,0.07834172248840332,0.07599806785583496,0.12686610221862793,0.15384626388549805,1.7273974418640137,0.5130970478057861,0.07660079002380371,0.07983899116516113,0.07729864120483398,0.07631778717041016,0.07897758483886719 diff --git a/results/combined/merges_timed/maxmind/geoip-api-java.csv b/results/combined/merges_timed/maxmind/geoip-api-java.csv index 1a6fed8010..a49af66b09 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,False,True,2,2,4,2,True,2,Tests_passed,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,True,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,True,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f98110b8e0f539e457cde5f88c30a70f6d52351ac1a8a7ea776420022b2fe6b1,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,98eb0bcc8b9b459d39e85ca0f464583f070d81ec63615fb8f594b946ca7624cc,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,86aac0df3132996a98dc117c21fe1bcf87c5c8a75d24aad034b83bd42d46edcd,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,0.04997992515563965,0.06135845184326172,0.06118297576904297,0.023523807525634766,0.06328344345092773,0.05200505256652832,0.04701733589172363,0.19075632095336914,0.14584589004516602,83.58075499534607,1.1943440437316895,35.4828941822052,0.07075190544128418,2.082070827484131,2.090169668197632,0.06206369400024414 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,False,True,2,2,4,2,True,2,Tests_passed,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,True,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,True,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f98110b8e0f539e457cde5f88c30a70f6d52351ac1a8a7ea776420022b2fe6b1,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,98eb0bcc8b9b459d39e85ca0f464583f070d81ec63615fb8f594b946ca7624cc,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,86aac0df3132996a98dc117c21fe1bcf87c5c8a75d24aad034b83bd42d46edcd,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,0.04997992515563965,0.06135845184326172,0.06118297576904297,0.023523807525634766,0.06328344345092773,0.05200505256652832,0.04701733589172363,0.19075632095336914,0.14584589004516602,83.58075499534607,1.1943440437316895,35.4828941822052,0.07075190544128418,2.082070827484131,2.090169668197632,0.06206369400024414,2.084969997406006,0.05683279037475586,2.0850989818573,0.057852745056152344,2.0836830139160156,2.0833165645599365,2.0858585834503174,2.117713689804077,2.134768009185791,87.02591633796692,1.3072624206542969,2.083812952041626,2.085979461669922,2.0864131450653076,2.085571050643921,0.05824565887451172 diff --git a/results/combined/merges_timed/mbaechler/proxy-servlet.csv b/results/combined/merges_timed/mbaechler/proxy-servlet.csv index a0f2a5778d..c5b122b204 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,True,5,18,69,6,True,8,Tests_passed,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,True,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,True,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,f3744895bb7a1a087f19c59148a13267726168aa4cb94dfe01d47490689158c8,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,bd7c52955d9bfe3699cde14e662e5587a392ef68e64017dd2e8a3f504f0d2696,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,0.04161524772644043,0.04479193687438965,0.03497123718261719,0.014739751815795898,0.0402982234954834,0.042790889739990234,0.039598703384399414,0.04715085029602051,0.176605224609375,1.332712173461914,0.45008158683776855,0.05241584777832031,0.05361771583557129,0.05135798454284668,0.054122209548950195,0.05376911163330078 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,True,5,18,69,6,True,8,Tests_passed,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,True,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,True,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,f3744895bb7a1a087f19c59148a13267726168aa4cb94dfe01d47490689158c8,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,bd7c52955d9bfe3699cde14e662e5587a392ef68e64017dd2e8a3f504f0d2696,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,0.04161524772644043,0.04479193687438965,0.03497123718261719,0.014739751815795898,0.0402982234954834,0.042790889739990234,0.039598703384399414,0.04715085029602051,0.176605224609375,1.332712173461914,0.45008158683776855,0.05241584777832031,0.05361771583557129,0.05135798454284668,0.054122209548950195,0.05376911163330078,0.05295681953430176,0.051222801208496094,0.05207204818725586,0.051178693771362305,0.05189013481140137,0.052225589752197266,0.05127143859863281,0.09929466247558594,0.12262105941772461,1.39314603805542,0.5092649459838867,0.05287337303161621,0.05203056335449219,0.051308393478393555,0.05227255821228027,0.05232548713684082 diff --git a/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv b/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv index ad04a44aab..c5f905a51c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,True,True,Tests_passed,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,True,13,47,448,3,True,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,True,13,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,81b2b38eac8749b184050871883bbaffff505fefee4490c1b15cf607813f112f,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Tests_failed,13838d3a26e2a7b9af7cbf0c1f7c6e745e66505cc534f02a5a2ea8427bda352b,Tests_passed,d5b5682c89455c3d94889c0cf9183f76c33960a76559d34970673739492773e9,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,1ee2624b0ebcae7f6227cbf72e643cb9120dc85b0ef292a7c90482bded4bc7cc,Tests_failed,5882004d3fd83fa945caa5397dead344bd23428ee267e8ffdb971685ad889fa3,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,0.00812983512878418,0.008117914199829102,0.008208513259887695,0.013091802597045898,0.008204936981201172,0.008028268814086914,0.007982730865478516,0.04277849197387695,0.11900544166564941,1.2941620349884033,0.3989291191101074,0.046198368072509766,0.07159113883972168,0.03899836540222168,0.07044625282287598,0.07009720802307129 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,True,True,Tests_passed,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,True,13,47,448,3,True,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,True,13,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,81b2b38eac8749b184050871883bbaffff505fefee4490c1b15cf607813f112f,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Tests_failed,13838d3a26e2a7b9af7cbf0c1f7c6e745e66505cc534f02a5a2ea8427bda352b,Tests_passed,d5b5682c89455c3d94889c0cf9183f76c33960a76559d34970673739492773e9,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,1ee2624b0ebcae7f6227cbf72e643cb9120dc85b0ef292a7c90482bded4bc7cc,Tests_failed,5882004d3fd83fa945caa5397dead344bd23428ee267e8ffdb971685ad889fa3,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,42540bc91a73c9d85839ec26744a9bbda430878c5a6d5a21b53ad5239a956ddd,Tests_passed,013fdbc1c535bed4d3de66df96a283e080593cb836ee090c19681f32dd8c7777,0.00812983512878418,0.008117914199829102,0.008208513259887695,0.013091802597045898,0.008204936981201172,0.008028268814086914,0.007982730865478516,0.04277849197387695,0.11900544166564941,1.2941620349884033,0.3989291191101074,0.046198368072509766,0.07159113883972168,0.03899836540222168,0.07044625282287598,0.07009720802307129,0.06774663925170898,0.06764769554138184,0.06597709655761719,0.06803774833679199,0.07013368606567383,0.06816673278808594,0.06833600997924805,0.11382532119750977,0.1292095184326172,1.4432368278503418,0.48822021484375,0.06891298294067383,0.07071733474731445,0.06898093223571777,0.06933879852294922,0.06925272941589355 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 16f1c52701..42b2b29e99 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,True,11,50,98,10,True,17,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,True,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,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_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,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,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,0.021429777145385742,0.021065235137939453,0.02538156509399414,0.03483128547668457,0.02598404884338379,0.02580857276916504,0.02571272850036621,0.09370636940002441,0.022217750549316406,0.03741455078125,0.37189412117004395,0.06315803527832031,0.13282990455627441,0.06309986114501953,0.12889862060546875,0.13143539428710938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,True,11,50,98,10,True,17,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,True,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,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_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,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,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,0.021429777145385742,0.021065235137939453,0.02538156509399414,0.03483128547668457,0.02598404884338379,0.02580857276916504,0.02571272850036621,0.09370636940002441,0.022217750549316406,0.03741455078125,0.37189412117004395,0.06315803527832031,0.13282990455627441,0.06309986114501953,0.12889862060546875,0.13143539428710938,0.12836098670959473,0.12535381317138672,0.1258084774017334,0.10540175437927246,0.13036417961120605,0.12939691543579102,0.12900876998901367,0.16423988342285156,0.13824820518493652,0.14219164848327637,0.4078946113586426,0.12382817268371582,0.12686777114868164,0.12397146224975586,0.12325668334960938,0.12325525283813477 diff --git a/results/combined/merges_timed/mbosecke/pebble.csv b/results/combined/merges_timed/mbosecke/pebble.csv index c805736ee7..14e151cb82 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -123,refs/heads/master,7b6bd591f14f5092a01f747e779f21acafa6959e,8bcaf4e262c09d73f043c5d5cbfd881dcf417c05,968a083e1012ad3b024324df36d00fe1e0c5f872,,True,True,True,49,516,2942.0,2,True,49,Tests_passed,d07e723fc6841045faa12bc7ea657f370fe4248659e73c574a4492c36a695748,True,Tests_passed,d5d09f2ff5aed8e7089dd759466fe3d39511e589715486ecf3f9c7c8fc40e3d8,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,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_failed,6f09311c16314607a9b2a3bad76523e1868d9e3a81482c421878cb4da24c3634,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,0.023484230041503906,0.04045915603637695,0.0447843074798584,0.02604508399963379,0.044142961502075195,0.04870796203613281,0.04265546798706055,0.20682072639465332,0.0801699161529541,0.03541207313537598,1.018111228942871,0.07647109031677246,0.07960224151611328,0.07210850715637207,0.0812520980834961,0.08588790893554688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +123,refs/heads/master,7b6bd591f14f5092a01f747e779f21acafa6959e,8bcaf4e262c09d73f043c5d5cbfd881dcf417c05,968a083e1012ad3b024324df36d00fe1e0c5f872,,True,True,True,49,516,2942.0,2,True,49,Tests_passed,d07e723fc6841045faa12bc7ea657f370fe4248659e73c574a4492c36a695748,True,Tests_passed,d5d09f2ff5aed8e7089dd759466fe3d39511e589715486ecf3f9c7c8fc40e3d8,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,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_failed,6f09311c16314607a9b2a3bad76523e1868d9e3a81482c421878cb4da24c3634,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,Tests_passed,a42b07c0f3171b24d92604f0a36cd7b673ea54f3d64c026880451b7654233f13,0.023484230041503906,0.04045915603637695,0.0447843074798584,0.02604508399963379,0.044142961502075195,0.04870796203613281,0.04265546798706055,0.20682072639465332,0.0801699161529541,0.03541207313537598,1.018111228942871,0.07647109031677246,0.07960224151611328,0.07210850715637207,0.0812520980834961,0.08588790893554688,0.07788538932800293,0.10701894760131836,0.08299660682678223,0.09644103050231934,0.11737585067749023,0.08555197715759277,0.1125938892364502,0.12693500518798828,0.11188578605651855,0.12402534484863281,1.075643539428711,0.10170936584472656,0.10168957710266113,0.08159232139587402,0.10561680793762207,0.07923364639282227 diff --git a/results/combined/merges_timed/mboudreau/alternator.csv b/results/combined/merges_timed/mboudreau/alternator.csv index df9ea56673..bebd4169b7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,True,19,136,1158,9,True,20,Tests_passed,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,True,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,True,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,cd152448e5cd1e5c7a1dc2ef3e4882769124cd3572c972faa0bc7e152d0ccd54,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_timedout,,Merge_failed,d62df665cc799c3841621741a415487407e8173efd2c804a05c023226d581eda,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,d15ba240ffd96af5e4b8cb6ff459cc4ac5fc9fe21c00f6e61b6b5f6e6903a007,Merge_failed,f36ebae0d4a8fbc0b10aacc7d0f9bd02eab85d96b1531db68b649a38e7b1beb3,Merge_failed,5f9fa4d45a063745455e5b3189af3f7d27dd715a03d44ec6a631a6082a3fe270,Merge_timedout,,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,0.01330423355102539,0.013509035110473633,0.01360321044921875,0.01977086067199707,0.013683080673217773,0.01313924789428711,0.013546228408813477,0.11070823669433594,0.3956267833709717,4.919229030609131,-1.0,0.08729910850524902,0.14990520477294922,0.08448457717895508,0.14930009841918945,0.1600964069366455 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,True,19,136,1158,9,True,20,Tests_passed,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,True,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,True,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,cd152448e5cd1e5c7a1dc2ef3e4882769124cd3572c972faa0bc7e152d0ccd54,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_timedout,,Merge_failed,d62df665cc799c3841621741a415487407e8173efd2c804a05c023226d581eda,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,d15ba240ffd96af5e4b8cb6ff459cc4ac5fc9fe21c00f6e61b6b5f6e6903a007,Merge_failed,f36ebae0d4a8fbc0b10aacc7d0f9bd02eab85d96b1531db68b649a38e7b1beb3,Merge_failed,5f9fa4d45a063745455e5b3189af3f7d27dd715a03d44ec6a631a6082a3fe270,Merge_timedout,,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,15ce8c14b76aba0e55abefc6f11647be405cc2e5e9c945e184b346ed621211f5,Merge_failed,6c6c8277df5b0f5ad2f6dea30af4c06d24dc70549632952926f85a51422ab530,0.01330423355102539,0.013509035110473633,0.01360321044921875,0.01977086067199707,0.013683080673217773,0.01313924789428711,0.013546228408813477,0.11070823669433594,0.3956267833709717,4.919229030609131,-1.0,0.08729910850524902,0.14990520477294922,0.08448457717895508,0.14930009841918945,0.1600964069366455,0.1457839012145996,0.15245628356933594,0.14523649215698242,0.15320754051208496,0.14723920822143555,0.1454758644104004,0.14622735977172852,0.27590513229370117,0.34494662284851074,5.255840063095093,-1.0,0.14776992797851562,0.1457502841949463,0.14436626434326172,0.1447618007659912,0.14969134330749512 diff --git a/results/combined/merges_timed/mcmmo-dev/mcmmo.csv b/results/combined/merges_timed/mcmmo-dev/mcmmo.csv index 1c6e31efc9..386761ae52 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,True,True,True,143,712,5593.0,6,True,143,Tests_passed,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,True,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,True,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,faa840119d3406991f8b1ebc639702db6686edaadb7b6e5b71b9dc1cb37abe29,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,6b12f4be006bfb1e851664b19ace213b3ccc01b6eb2f6c64f68719b380970378,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,0.04716682434082031,0.06215238571166992,0.06283879280090332,0.07575726509094238,0.05555081367492676,0.05546975135803223,0.05506396293640137,0.1840202808380127,0.3217172622680664,0.10974335670471191,2.39266300201416,0.13490819931030273,0.2334592342376709,0.13915395736694336,0.22818303108215332,0.23529458045959473 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,True,True,True,143,712,5593.0,6,True,143,Tests_passed,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,True,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,True,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,faa840119d3406991f8b1ebc639702db6686edaadb7b6e5b71b9dc1cb37abe29,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,6b12f4be006bfb1e851664b19ace213b3ccc01b6eb2f6c64f68719b380970378,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,0.04716682434082031,0.06215238571166992,0.06283879280090332,0.07575726509094238,0.05555081367492676,0.05546975135803223,0.05506396293640137,0.1840202808380127,0.3217172622680664,0.10974335670471191,2.39266300201416,0.13490819931030273,0.2334592342376709,0.13915395736694336,0.22818303108215332,0.23529458045959473,0.21732473373413086,0.22406530380249023,0.23035311698913574,0.22831416130065918,0.22385144233703613,0.2358412742614746,0.2340106964111328,0.37047457695007324,0.3710441589355469,0.24593591690063477,2.604771614074707,0.2048780918121338,0.22121357917785645,0.21549439430236816,0.21682167053222656,0.2269580364227295 diff --git a/results/combined/merges_timed/mcupak/beacon-of-beacons.csv b/results/combined/merges_timed/mcupak/beacon-of-beacons.csv index eaf7eb95f0..c65ca70a14 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,True,159,521,9036,27,True,162,Tests_passed,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,True,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,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,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,8e45b9cf120881687ae4455d54743e3d77b3c78303a6a3c614f67ba126cefdca,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,0.05915546417236328,0.06881499290466309,0.04349851608276367,0.03770780563354492,0.03338336944580078,0.08196592330932617,0.06272006034851074,1.5589404106140137,1.4809317588806152,18.022812366485596,0.9399077892303467,0.22823333740234375,0.5789260864257812,0.1771097183227539,0.5667922496795654,0.5727014541625977 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,True,159,521,9036,27,True,162,Tests_passed,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,True,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,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,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,a665c6dbfc877dbba39c7561d2d940d60e73b0973aece815117e8982ec4aba58,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,8e45b9cf120881687ae4455d54743e3d77b3c78303a6a3c614f67ba126cefdca,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,Merge_failed,71224640da84977d60287389ca8492c82bc333df1e4ada63f9d18b2eddddadd8,0.05915546417236328,0.06881499290466309,0.04349851608276367,0.03770780563354492,0.03338336944580078,0.08196592330932617,0.06272006034851074,1.5589404106140137,1.4809317588806152,18.022812366485596,0.9399077892303467,0.22823333740234375,0.5789260864257812,0.1771097183227539,0.5667922496795654,0.5727014541625977,0.5600857734680176,0.5775437355041504,0.5649566650390625,0.5677132606506348,0.5657069683074951,0.5672674179077148,0.5746250152587891,0.9963386058807373,1.2443723678588867,20.24223756790161,1.5973381996154785,0.5777015686035156,0.594383716583252,0.5645990371704102,0.5831537246704102,0.5667216777801514 diff --git a/results/combined/merges_timed/mdeanda/lorem.csv b/results/combined/merges_timed/mdeanda/lorem.csv index 8a27520ca9..541dd4c18f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,True,4,10,29,2,True,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,True,4,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,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,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,30b053c09ce1b73eca73bf75f297d1c67a84c9c25d1c1890fa3386150fd64426,Tests_passed,265ae2237441fbed239a7c038ac07cd16f7584bd2f76be2e0d1a42c804042287,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,0.02725839614868164,0.029724836349487305,0.018395662307739258,0.013934850692749023,0.03344321250915527,0.026098012924194336,0.024306774139404297,0.11062049865722656,0.0910646915435791,0.9256606101989746,0.3083310127258301,0.029450654983520508,0.05501079559326172,0.029672622680664062,0.05337023735046387,0.05405092239379883 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,True,4,10,29,2,True,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,True,4,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,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,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,30b053c09ce1b73eca73bf75f297d1c67a84c9c25d1c1890fa3386150fd64426,Tests_passed,265ae2237441fbed239a7c038ac07cd16f7584bd2f76be2e0d1a42c804042287,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,0.02725839614868164,0.029724836349487305,0.018395662307739258,0.013934850692749023,0.03344321250915527,0.026098012924194336,0.024306774139404297,0.11062049865722656,0.0910646915435791,0.9256606101989746,0.3083310127258301,0.029450654983520508,0.05501079559326172,0.029672622680664062,0.05337023735046387,0.05405092239379883,0.051065921783447266,0.051712751388549805,0.05109071731567383,0.05204033851623535,0.05134248733520508,0.05007314682006836,0.05156111717224121,0.08242440223693848,0.08286833763122559,0.9062674045562744,0.32311391830444336,0.05175018310546875,0.05181264877319336,0.05199837684631348,0.05212140083312988,0.05131030082702637 diff --git a/results/combined/merges_timed/mdeinum/spring-batch-excel.csv b/results/combined/merges_timed/mdeinum/spring-batch-excel.csv index 0b51572914..c9ec48a92b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,True,True,Tests_passed,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,True,9,17,434,45,True,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,True,49,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,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,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,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,0.031099796295166016,0.03827333450317383,0.0673370361328125,0.036651611328125,0.03540992736816406,0.052695274353027344,0.05703377723693848,0.32517290115356445,0.3049352169036865,2.5501067638397217,0.4303133487701416,0.05793595314025879,0.0795137882232666,0.05579566955566406,0.07741498947143555,0.07663583755493164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,True,True,Tests_passed,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,True,9,17,434,45,True,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,True,49,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,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,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,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,0.031099796295166016,0.03827333450317383,0.0673370361328125,0.036651611328125,0.03540992736816406,0.052695274353027344,0.05703377723693848,0.32517290115356445,0.3049352169036865,2.5501067638397217,0.4303133487701416,0.05793595314025879,0.0795137882232666,0.05579566955566406,0.07741498947143555,0.07663583755493164,0.07521176338195801,0.07861804962158203,0.08126091957092285,0.08450174331665039,0.08251452445983887,0.08202815055847168,0.08327198028564453,0.14716863632202148,0.18750596046447754,2.636922836303711,0.48449110984802246,0.07661700248718262,0.07531976699829102,0.07563996315002441,0.07894253730773926,0.07483792304992676 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv index 36929d524f..2149b98f52 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,True,7,32,229,2,True,7,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,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,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,e705d289afafe5258ead48bd63d38edb023848cf2e8625f9fd6860e7a6742bdc,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.09551239013671875,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.1122901439666748,1.1493992805480957,0.37911033630371094,0.14033174514770508,0.16533327102661133,0.14278841018676758,0.17093777656555176,0.1707768440246582 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,True,7,32,229,2,True,7,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,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,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,e705d289afafe5258ead48bd63d38edb023848cf2e8625f9fd6860e7a6742bdc,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,Tests_passed,9829e789540f2f8b077fa813d970bbfe984d8ccafb6c2959486da4bafa745dad,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.09551239013671875,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.1122901439666748,1.1493992805480957,0.37911033630371094,0.14033174514770508,0.16533327102661133,0.14278841018676758,0.17093777656555176,0.1707768440246582,0.16971707344055176,0.1609971523284912,0.1919691562652588,0.19762492179870605,0.15706658363342285,0.20313477516174316,0.18810153007507324,0.1943826675415039,0.2302074432373047,1.3123295307159424,0.481090784072876,0.17074322700500488,0.16668391227722168,0.16160964965820312,0.16399741172790527,0.16576480865478516 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv index bc9e68974a..b2f0c99da4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,9ad48e146367f54c403c9cbd00ec9a475956f0a117160ec1efac9bb8fdd2b203,Tests_failed,f496a816f972f08db33abf3efd32a15d2fc8b83e91d30c56c62a35bba7547830,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.014198064804077148,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.11369752883911133,0.6239135265350342,0.46440696716308594,0.0424342155456543,0.04398798942565918,0.040799617767333984,0.05575060844421387,0.05649113655090332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,9ad48e146367f54c403c9cbd00ec9a475956f0a117160ec1efac9bb8fdd2b203,Tests_failed,f496a816f972f08db33abf3efd32a15d2fc8b83e91d30c56c62a35bba7547830,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.014198064804077148,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.11369752883911133,0.6239135265350342,0.46440696716308594,0.0424342155456543,0.04398798942565918,0.040799617767333984,0.05575060844421387,0.05649113655090332,0.05092954635620117,0.05289483070373535,0.05398988723754883,0.05451798439025879,0.053121089935302734,0.05312657356262207,0.05510711669921875,0.08289337158203125,0.0891728401184082,0.6356499195098877,0.520768404006958,0.05495572090148926,0.054009437561035156,0.05542612075805664,0.052765607833862305,0.05276966094970703 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv index 084185c35d..c094fb6be9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,True,12,71,184,2,True,12,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,True,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,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,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,c20045c93bdeda547a2decede5fa3fda92d48115f5ced8e9affc6fe21c55ab45,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,0.053955793380737305,0.043679237365722656,0.05874180793762207,0.020360231399536133,0.062160491943359375,0.054827213287353516,0.04497504234313965,0.1820988655090332,0.11847281455993652,0.6454041004180908,0.3482959270477295,0.035681962966918945,0.06315016746520996,0.03664135932922363,0.06272363662719727,0.0636298656463623 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,True,12,71,184,2,True,12,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,True,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,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,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,c20045c93bdeda547a2decede5fa3fda92d48115f5ced8e9affc6fe21c55ab45,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,de61d92a1e8b1febe613bbed29f7637c59b484b86b89f97b80d1163f956fef1a,Tests_passed,f215fe5306b1824752d3db86984739978ee874ef3b94e3fc09d0ad17a0192d4d,0.053955793380737305,0.043679237365722656,0.05874180793762207,0.020360231399536133,0.062160491943359375,0.054827213287353516,0.04497504234313965,0.1820988655090332,0.11847281455993652,0.6454041004180908,0.3482959270477295,0.035681962966918945,0.06315016746520996,0.03664135932922363,0.06272363662719727,0.0636298656463623,0.060797691345214844,0.059444427490234375,0.06279850006103516,0.06328368186950684,0.059810638427734375,0.0619509220123291,0.06038498878479004,0.09467196464538574,0.09195542335510254,0.676501989364624,0.37833189964294434,0.0607302188873291,0.05919790267944336,0.059404850006103516,0.06018519401550293,0.05977892875671387 diff --git a/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv b/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv index a5c9f2376a..1f11f8c92d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,True,True,Tests_passed,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,True,8,50,1239,4,True,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,True,8,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,fa5517c168d95feeabb2077254466d1b7f487964fd512f1b0dc1cb141ad082cd,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,6cbca87c62fc98706d40fa31f9e884cb742b59e62e6eb5411d597ed97bd32eec,Merge_failed,1611fcfbfa9e6a8971b9c290ce88118ac4d04ab8d40b94736103392d130541fe,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,3c6cc0518b8d439fb2882ba4330b91c19567a900c17f6d9eaddd7fedc6a8edbe,Merge_failed,aad4ad9c3834f01882a417334d19d59e28fa06a87ebb2dc5e2fd16451deb152c,Merge_failed,aad4ad9c3834f01882a417334d19d59e28fa06a87ebb2dc5e2fd16451deb152c,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,8e9f2f9f23f85bf9159004755fc26fdad812eec5334f993f7393ad631e3944df,Merge_failed,87b492290858909952bfa1920b077ba857e2a8a46ee69129f163a8b7c52c3093,Merge_failed,8f532497f05c786a6326724a2416cf94353c91a74d187f4cdf1eaef2494dfc8a,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,0.03800463676452637,0.041405439376831055,0.03808093070983887,0.013422727584838867,0.04142427444458008,0.042165517807006836,0.03974604606628418,0.2946512699127197,0.2369093894958496,0.8701612949371338,0.411038875579834,0.05148196220397949,0.07199263572692871,0.05186581611633301,0.07370138168334961,0.07040953636169434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,True,True,Tests_passed,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,True,8,50,1239,4,True,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,True,8,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,fa5517c168d95feeabb2077254466d1b7f487964fd512f1b0dc1cb141ad082cd,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,6cbca87c62fc98706d40fa31f9e884cb742b59e62e6eb5411d597ed97bd32eec,Merge_failed,1611fcfbfa9e6a8971b9c290ce88118ac4d04ab8d40b94736103392d130541fe,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,3c6cc0518b8d439fb2882ba4330b91c19567a900c17f6d9eaddd7fedc6a8edbe,Merge_failed,aad4ad9c3834f01882a417334d19d59e28fa06a87ebb2dc5e2fd16451deb152c,Merge_failed,aad4ad9c3834f01882a417334d19d59e28fa06a87ebb2dc5e2fd16451deb152c,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,8e9f2f9f23f85bf9159004755fc26fdad812eec5334f993f7393ad631e3944df,Merge_failed,87b492290858909952bfa1920b077ba857e2a8a46ee69129f163a8b7c52c3093,Merge_failed,8f532497f05c786a6326724a2416cf94353c91a74d187f4cdf1eaef2494dfc8a,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,19307302b1258b088ac9aca5ac515e5129fa82e590b1e545cc30f81409cac218,Merge_failed,7e2910420ffa1bb55fd83a616b052f535c074fa1bad95df87d17aaee45dbafba,0.03800463676452637,0.041405439376831055,0.03808093070983887,0.013422727584838867,0.04142427444458008,0.042165517807006836,0.03974604606628418,0.2946512699127197,0.2369093894958496,0.8701612949371338,0.411038875579834,0.05148196220397949,0.07199263572692871,0.05186581611633301,0.07370138168334961,0.07040953636169434,0.06991171836853027,0.068603515625,0.06954336166381836,0.06894111633300781,0.0696561336517334,0.06870365142822266,0.06947517395019531,0.1316509246826172,0.15654969215393066,0.8867537975311279,0.4776003360748291,0.07039046287536621,0.07025527954101562,0.06978535652160645,0.06948089599609375,0.06944131851196289 diff --git a/results/combined/merges_timed/mercadopago/sdk-java.csv b/results/combined/merges_timed/mercadopago/sdk-java.csv index dc12acd0a1..9054e5bf9b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,673,3,True,6,Tests_passed,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,969d1c19cf4fccc8e137ff299f2a630189159b4cf48e1972db1df7494d9668cc,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Tests_failed,43b27133e46c1b5b0559aadfe5e78648b255e59edac201f885a589574f2b50a9,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,5cf1e630df249e242c58191c5af01fced415fa85a03360fb0dd71c0fd40eafb3,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,67fda1abf5a4034050ef8de16219f5993767b090ecdc40de16a88ef0d986955d,Tests_failed,e181f40c421e27b7c95f05faddd9c289789a2a34697d855493b71841c6360509,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,0.04569125175476074,0.044678688049316406,0.04433941841125488,0.018456220626831055,0.050307512283325195,0.048393964767456055,0.02684926986694336,0.24739694595336914,0.16317081451416016,1.0416319370269775,0.4034247398376465,0.04557466506958008,0.06502819061279297,0.04449892044067383,0.06599688529968262,0.06384634971618652 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,673,3,True,6,Tests_passed,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,969d1c19cf4fccc8e137ff299f2a630189159b4cf48e1972db1df7494d9668cc,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Tests_failed,43b27133e46c1b5b0559aadfe5e78648b255e59edac201f885a589574f2b50a9,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,5cf1e630df249e242c58191c5af01fced415fa85a03360fb0dd71c0fd40eafb3,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,67fda1abf5a4034050ef8de16219f5993767b090ecdc40de16a88ef0d986955d,Tests_failed,e181f40c421e27b7c95f05faddd9c289789a2a34697d855493b71841c6360509,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,0.04569125175476074,0.044678688049316406,0.04433941841125488,0.018456220626831055,0.050307512283325195,0.048393964767456055,0.02684926986694336,0.24739694595336914,0.16317081451416016,1.0416319370269775,0.4034247398376465,0.04557466506958008,0.06502819061279297,0.04449892044067383,0.06599688529968262,0.06384634971618652,0.06247997283935547,0.06259775161743164,0.0632026195526123,0.06345915794372559,0.06278824806213379,0.06457710266113281,0.06200456619262695,0.11389350891113281,0.11841678619384766,1.0820610523223877,0.504375696182251,0.06322097778320312,0.06438994407653809,0.06357002258300781,0.06216716766357422,0.06193089485168457 diff --git a/results/combined/merges_timed/metamx/extendedset.csv b/results/combined/merges_timed/metamx/extendedset.csv index 2706723e6a..9cfd1164e4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,True,True,Tests_passed,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,True,3,12,51,2,True,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,True,3,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,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,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,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,649b166e188c33d05073417bef6239738b06da789f955f4f2b50f33519853b5d,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,0.045398712158203125,0.05454850196838379,0.04793524742126465,0.022421836853027344,0.047647714614868164,0.06568527221679688,0.04534792900085449,0.16797327995300293,0.10195803642272949,1.4990735054016113,0.4115917682647705,0.04305100440979004,0.07061314582824707,0.042005062103271484,0.06965351104736328,0.06947660446166992 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,True,True,Tests_passed,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,True,3,12,51,2,True,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,True,3,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,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,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,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,649b166e188c33d05073417bef6239738b06da789f955f4f2b50f33519853b5d,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,0.045398712158203125,0.05454850196838379,0.04793524742126465,0.022421836853027344,0.047647714614868164,0.06568527221679688,0.04534792900085449,0.16797327995300293,0.10195803642272949,1.4990735054016113,0.4115917682647705,0.04305100440979004,0.07061314582824707,0.042005062103271484,0.06965351104736328,0.06947660446166992,0.06922793388366699,0.067108154296875,0.06969499588012695,0.06807827949523926,0.0694584846496582,0.07314848899841309,0.07206296920776367,0.10448336601257324,0.1031806468963623,1.4844725131988525,0.4450809955596924,0.0686039924621582,0.0653846263885498,0.06853151321411133,0.06637930870056152,0.06721949577331543 diff --git a/results/combined/merges_timed/meyerjp3/psychometrics.csv b/results/combined/merges_timed/meyerjp3/psychometrics.csv index 19430328b5..df942b4dd7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,True,True,Tests_passed,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,True,16,35,339,2,True,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,True,16,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,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,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,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,957cd00b9c2dfbac69269e3fecfb98c2caad7d51cb39d4fd80400e10ef0d7e9b,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,0.04250335693359375,0.05360150337219238,0.03544044494628906,0.024116039276123047,0.04923415184020996,0.015531539916992188,0.04295086860656738,0.1409282684326172,0.11105179786682129,0.8189957141876221,0.7580039501190186,0.04009675979614258,0.061722755432128906,0.04181814193725586,0.06280779838562012,0.06312918663024902 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,True,True,Tests_passed,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,True,16,35,339,2,True,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,True,16,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,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,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,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,957cd00b9c2dfbac69269e3fecfb98c2caad7d51cb39d4fd80400e10ef0d7e9b,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,0.04250335693359375,0.05360150337219238,0.03544044494628906,0.024116039276123047,0.04923415184020996,0.015531539916992188,0.04295086860656738,0.1409282684326172,0.11105179786682129,0.8189957141876221,0.7580039501190186,0.04009675979614258,0.061722755432128906,0.04181814193725586,0.06280779838562012,0.06312918663024902,0.06141805648803711,0.06518816947937012,0.0654611587524414,0.06432080268859863,0.06441187858581543,0.0627586841583252,0.06718635559082031,0.09953022003173828,0.1029195785522461,0.9437868595123291,0.8618152141571045,0.06274676322937012,0.06441330909729004,0.06418466567993164,0.06355619430541992,0.06298613548278809 diff --git a/results/combined/merges_timed/mh4j/metaheuristics4java.csv b/results/combined/merges_timed/mh4j/metaheuristics4java.csv index ada2334ad2..5e9c457775 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,True,50,68,2151,3,True,50,Tests_passed,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,True,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,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,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_timedout,,Tests_failed,fea1ad8aaaae3e2b5c0af078bd9d0f962c608fa668cd13cacf46cfc6678dc396,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,528ec7b2cfe2eb8ec6345a4f55df390b8689d0edea8e0dc05451bd5d8548b697,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,01a7dfa5322871870863e48aebbab73ccdbc8861cb628453a7cb4314dfa59f0e,Merge_timedout,,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,0.04704713821411133,0.03520917892456055,0.046874046325683594,0.01625537872314453,0.04611849784851074,0.04626655578613281,0.04785275459289551,0.23510241508483887,0.181441068649292,1.304821252822876,-1.0,0.06628918647766113,0.056111812591552734,0.05436205863952637,0.05669069290161133,0.056253910064697266 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,True,50,68,2151,3,True,50,Tests_passed,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,True,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,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,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_timedout,,Tests_failed,fea1ad8aaaae3e2b5c0af078bd9d0f962c608fa668cd13cacf46cfc6678dc396,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,528ec7b2cfe2eb8ec6345a4f55df390b8689d0edea8e0dc05451bd5d8548b697,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,01a7dfa5322871870863e48aebbab73ccdbc8861cb628453a7cb4314dfa59f0e,Merge_timedout,,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,0.04704713821411133,0.03520917892456055,0.046874046325683594,0.01625537872314453,0.04611849784851074,0.04626655578613281,0.04785275459289551,0.23510241508483887,0.181441068649292,1.304821252822876,-1.0,0.06628918647766113,0.056111812591552734,0.05436205863952637,0.05669069290161133,0.056253910064697266,0.05365467071533203,0.05415463447570801,0.05440998077392578,0.054406166076660156,0.0532529354095459,0.05452108383178711,0.05455946922302246,0.10207939147949219,0.12063193321228027,1.3364408016204834,-1.0,0.05596113204956055,0.05467081069946289,0.055298805236816406,0.053816795349121094,0.05407452583312988 diff --git a/results/combined/merges_timed/michaelwittig/java-q.csv b/results/combined/merges_timed/michaelwittig/java-q.csv index 81b9a7d9f8..2105350fde 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,True,119,345,770,2,True,119,Tests_passed,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,True,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,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,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,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,1cc7b232b9344e1a5c6e11367840e70d2c46a5a165d561ace79acaeab2237dff,Tests_failed,d7a5110ce07a8be6e967416929dbfae67a6053015b7ab36b3f561d3762f57527,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,0.05081367492675781,0.03737044334411621,0.03430676460266113,0.021361351013183594,0.05768013000488281,0.03908133506774902,0.057528018951416016,0.1667041778564453,0.12297964096069336,0.5518209934234619,0.6454501152038574,0.03833317756652832,0.05975484848022461,0.03856611251831055,0.0615086555480957,0.06143951416015625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,True,119,345,770,2,True,119,Tests_passed,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,True,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,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,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,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,1cc7b232b9344e1a5c6e11367840e70d2c46a5a165d561ace79acaeab2237dff,Tests_failed,d7a5110ce07a8be6e967416929dbfae67a6053015b7ab36b3f561d3762f57527,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,0.05081367492675781,0.03737044334411621,0.03430676460266113,0.021361351013183594,0.05768013000488281,0.03908133506774902,0.057528018951416016,0.1667041778564453,0.12297964096069336,0.5518209934234619,0.6454501152038574,0.03833317756652832,0.05975484848022461,0.03856611251831055,0.0615086555480957,0.06143951416015625,0.06234383583068848,0.06270575523376465,0.06324601173400879,0.06292438507080078,0.06387853622436523,0.0643315315246582,0.06455159187316895,0.0984184741973877,0.0935218334197998,0.6212389469146729,0.7633862495422363,0.06106138229370117,0.06355977058410645,0.06229758262634277,0.06154322624206543,0.06311798095703125 diff --git a/results/combined/merges_timed/micromata/javaapiforkml.csv b/results/combined/merges_timed/micromata/javaapiforkml.csv index 1515d2dea7..20655a331f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,True,134,4063,10473,3,True,134,Tests_passed,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,True,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,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,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,9074741473ed0cbc13718bf04d3ad0bf2d46ede8bfa946016785f1966de923b4,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,3d6bb28b3a5a177a4038a33be0dfd8766d64938fce1a3796476fa9cf6b67d976,Merge_timedout,,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,0.039652109146118164,0.03619670867919922,0.05529141426086426,0.049933433532714844,0.053450584411621094,0.04528522491455078,0.05464363098144531,0.18065834045410156,0.16994929313659668,1.1968464851379395,-1.0,0.08723974227905273,0.09427070617675781,0.08289766311645508,0.10798287391662598,0.11228156089782715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,True,134,4063,10473,3,True,134,Tests_passed,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,True,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,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,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,9074741473ed0cbc13718bf04d3ad0bf2d46ede8bfa946016785f1966de923b4,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,3d6bb28b3a5a177a4038a33be0dfd8766d64938fce1a3796476fa9cf6b67d976,Merge_timedout,,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,0.039652109146118164,0.03619670867919922,0.05529141426086426,0.049933433532714844,0.053450584411621094,0.04528522491455078,0.05464363098144531,0.18065834045410156,0.16994929313659668,1.1968464851379395,-1.0,0.08723974227905273,0.09427070617675781,0.08289766311645508,0.10798287391662598,0.11228156089782715,0.11052346229553223,0.1082298755645752,0.10939955711364746,0.1118319034576416,0.11036467552185059,0.11472725868225098,0.11150074005126953,0.17217683792114258,0.1880817413330078,1.4294145107269287,-1.0,0.09841394424438477,0.10256314277648926,0.10066008567810059,0.09952783584594727,0.1026163101196289 diff --git a/results/combined/merges_timed/mikaelhg/openblocks.csv b/results/combined/merges_timed/mikaelhg/openblocks.csv index 8a629fd8fd..140761daf4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,True,66,512,1962,20,True,66,Tests_passed,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,True,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,True,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Tests_failed,61b1d0e5f7ce0b98342c75f7b0369a23127f0778f16f09e3943333f648804074,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_failed,fe3351f27f579b182a550d7de5467ead4ca99e14d239e13c1f9f14b31f5a863b,Tests_failed,ca1563337b3389ab4e01df0523131d3c733492ff7d398e6214cfc83db2e7f571,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,0.03145408630371094,0.03414130210876465,0.034848690032958984,0.040816307067871094,0.03923964500427246,0.03901243209838867,0.03962349891662598,0.3562040328979492,1.072967767715454,22.9702308177948,2.0268309116363525,0.09716558456420898,0.523003101348877,0.06540393829345703,0.5431978702545166,0.5429379940032959 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,True,66,512,1962,20,True,66,Tests_passed,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,True,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,True,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Tests_failed,61b1d0e5f7ce0b98342c75f7b0369a23127f0778f16f09e3943333f648804074,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_failed,fe3351f27f579b182a550d7de5467ead4ca99e14d239e13c1f9f14b31f5a863b,Tests_failed,ca1563337b3389ab4e01df0523131d3c733492ff7d398e6214cfc83db2e7f571,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,Tests_passed,c5ff5505269e545f473d795f6b098b3c4bf8a23e95253ce04634366546b30209,0.03145408630371094,0.03414130210876465,0.034848690032958984,0.040816307067871094,0.03923964500427246,0.03901243209838867,0.03962349891662598,0.3562040328979492,1.072967767715454,22.9702308177948,2.0268309116363525,0.09716558456420898,0.523003101348877,0.06540393829345703,0.5431978702545166,0.5429379940032959,0.5473697185516357,0.5487163066864014,0.546954870223999,0.5053064823150635,0.49175381660461426,0.519773006439209,0.5477886199951172,0.8489348888397217,0.9574785232543945,20.815229415893555,2.6280429363250732,0.4930734634399414,0.48101258277893066,0.49227213859558105,0.5320255756378174,0.5510537624359131 diff --git a/results/combined/merges_timed/mikera/vectorz.csv b/results/combined/merges_timed/mikera/vectorz.csv index c09153c0ac..1e0784cfb3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -82,refs/heads/develop,38479c7a71896eeae10016b9816c3adfd10677c7,aa4246cef8d514c5ba431760237a475f2bc93a6f,5ce3d141304790445a47f3ba853f1b458f3416a2,,True,True,Tests_passed,8a82f846364a62b45072b39c550008088bcb6d5e89a38e0460f20e8714f16d9d,True,23,77,695,2,True,Tests_passed,ba9b49be5b7ad61f7f291f8f750bd331aa7e945cf42e82e09404246ca0d51da2,True,23,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,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Tests_failed,3c44c5924494f230ce235aae07e1af240373c5d5601cd3fd0319e8cbd400212a,Tests_failed,d7e7f6107e87408a95676ea06d1cd382ad7f94950654ce254505b31526a65d6b,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,5aa6bad6096f2fd76a730e4497d4c45a77939adce5878b3acb7505108a7ed953,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,6ecf6b7098b6ca98fadda75359c378f2150ff5c06e4695f422fc194fba962b8c,Tests_failed,fdb20ca2db1b0a12765ae6c77c4840513105387f6be4608907fab1911a84e656,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,0.02031993865966797,0.020007848739624023,0.023253679275512695,0.017847537994384766,0.014026165008544922,0.031684160232543945,0.02433633804321289,0.05715537071228027,0.08564901351928711,0.47980713844299316,0.866703987121582,0.05255484580993652,0.05863761901855469,0.06679844856262207,0.049154043197631836,0.04853177070617676 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +82,refs/heads/develop,38479c7a71896eeae10016b9816c3adfd10677c7,aa4246cef8d514c5ba431760237a475f2bc93a6f,5ce3d141304790445a47f3ba853f1b458f3416a2,,True,True,Tests_passed,8a82f846364a62b45072b39c550008088bcb6d5e89a38e0460f20e8714f16d9d,True,23,77,695,2,True,Tests_passed,ba9b49be5b7ad61f7f291f8f750bd331aa7e945cf42e82e09404246ca0d51da2,True,23,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,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Tests_failed,3c44c5924494f230ce235aae07e1af240373c5d5601cd3fd0319e8cbd400212a,Tests_failed,d7e7f6107e87408a95676ea06d1cd382ad7f94950654ce254505b31526a65d6b,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,5aa6bad6096f2fd76a730e4497d4c45a77939adce5878b3acb7505108a7ed953,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,6ecf6b7098b6ca98fadda75359c378f2150ff5c06e4695f422fc194fba962b8c,Tests_failed,fdb20ca2db1b0a12765ae6c77c4840513105387f6be4608907fab1911a84e656,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,0.02031993865966797,0.020007848739624023,0.023253679275512695,0.017847537994384766,0.014026165008544922,0.031684160232543945,0.02433633804321289,0.05715537071228027,0.08564901351928711,0.47980713844299316,0.866703987121582,0.05255484580993652,0.05863761901855469,0.06679844856262207,0.049154043197631836,0.04853177070617676,0.06477785110473633,0.04717421531677246,0.047225236892700195,0.06552863121032715,0.048607587814331055,0.04804182052612305,0.06437277793884277,0.10062456130981445,0.08449816703796387,0.5003421306610107,0.935828685760498,0.046561241149902344,0.048635005950927734,0.060785770416259766,0.047605276107788086,0.04865908622741699 diff --git a/results/combined/merges_timed/mikvor/money-conversion.csv b/results/combined/merges_timed/mikvor/money-conversion.csv index 68de51da17..976dc35212 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,True,False,Tests_passed,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,True,6,7,97,3,True,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,True,6,True,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,99e456e0c5c4c36f64a184a7e0834585836fc191dddf6e2824ac92994c96c2f4,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,Tests_failed,43f724f82ba7da67914c15c5d1f829d4dcad57c4d0ac5b79504201c8129f3ac5,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,81c0335383455181d98c9711e4c00d9d2c723504f78d5004d564ba50da6bb6ae,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,bb2c4832b352592f8d1ef91362968550df6485230df3ad5b8cec2aeca761a72f,Tests_failed,a537fc1edb5521b011f7f3a39ea29a5a6390b0a2c787eee8ba05d2d7ab79bcea,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,0.04006242752075195,0.040935516357421875,0.042252540588378906,0.013236284255981445,0.04263019561767578,0.04160499572753906,0.03755354881286621,0.23112034797668457,0.16553616523742676,1.625643014907837,0.339066743850708,0.047907114028930664,0.06244921684265137,0.040130615234375,0.07116079330444336,0.07001280784606934 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,True,False,Tests_passed,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,True,6,7,97,3,True,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,True,6,True,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,99e456e0c5c4c36f64a184a7e0834585836fc191dddf6e2824ac92994c96c2f4,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,Tests_failed,43f724f82ba7da67914c15c5d1f829d4dcad57c4d0ac5b79504201c8129f3ac5,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,81c0335383455181d98c9711e4c00d9d2c723504f78d5004d564ba50da6bb6ae,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,bb2c4832b352592f8d1ef91362968550df6485230df3ad5b8cec2aeca761a72f,Tests_failed,a537fc1edb5521b011f7f3a39ea29a5a6390b0a2c787eee8ba05d2d7ab79bcea,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,0.04006242752075195,0.040935516357421875,0.042252540588378906,0.013236284255981445,0.04263019561767578,0.04160499572753906,0.03755354881286621,0.23112034797668457,0.16553616523742676,1.625643014907837,0.339066743850708,0.047907114028930664,0.06244921684265137,0.040130615234375,0.07116079330444336,0.07001280784606934,0.06989502906799316,0.0690310001373291,0.0716407299041748,0.07091808319091797,0.06960678100585938,0.06925606727600098,0.06879830360412598,0.11769652366638184,0.13427186012268066,1.8207933902740479,0.4548218250274658,0.07031130790710449,0.06819391250610352,0.06928229331970215,0.07091379165649414,0.07127189636230469 diff --git a/results/combined/merges_timed/milkbowl/vaultapi.csv b/results/combined/merges_timed/milkbowl/vaultapi.csv index aa506dd5da..cd091e5eec 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,True,12,23,2253,2,True,12,Tests_passed,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,True,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,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,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,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,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,38ada8192fb78ae02a8c79a96f955b7af96481ff82276bacd6fdb46fbd84fa2d,Tests_failed,0a31313d9626955e76b3f011b8e665d0ff7f181f1cd264c8c25cbfb6d21fda02,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,0.009462594985961914,0.009325027465820312,0.009758949279785156,0.015877246856689453,0.009789705276489258,0.010204076766967773,0.010285615921020508,0.033596038818359375,0.06456995010375977,0.4638633728027344,0.40111279487609863,0.03170490264892578,0.055828094482421875,0.03286409378051758,0.05553603172302246,0.0551760196685791 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,True,12,23,2253,2,True,12,Tests_passed,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,True,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,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,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,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,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,38ada8192fb78ae02a8c79a96f955b7af96481ff82276bacd6fdb46fbd84fa2d,Tests_failed,0a31313d9626955e76b3f011b8e665d0ff7f181f1cd264c8c25cbfb6d21fda02,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,0.009462594985961914,0.009325027465820312,0.009758949279785156,0.015877246856689453,0.009789705276489258,0.010204076766967773,0.010285615921020508,0.033596038818359375,0.06456995010375977,0.4638633728027344,0.40111279487609863,0.03170490264892578,0.055828094482421875,0.03286409378051758,0.05553603172302246,0.0551760196685791,0.056874990463256836,0.055585622787475586,0.05612516403198242,0.05761289596557617,0.054265737533569336,0.05604982376098633,0.056505680084228516,0.08762097358703613,0.0887303352355957,0.5421459674835205,0.49198341369628906,0.05498814582824707,0.05502581596374512,0.05497431755065918,0.054312705993652344,0.05606245994567871 diff --git a/results/combined/merges_timed/mimno/mallet.csv b/results/combined/merges_timed/mimno/mallet.csv index 64e3f1f801..8e3018e063 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,Tests_passed,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,True,129,1280,4680,4,True,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,True,129,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,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,9952a062b61f0c9151a5ae571b968975a0be9fb6d2fb7eb1c39fd392855f8381,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,379a2e029a26955447b9a1b506c0c56cb9af8f53a3fa34cb9747d39613dc275c,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,0.0603785514831543,0.05301380157470703,0.058934926986694336,0.04587745666503906,0.05718708038330078,0.06647109985351562,0.06812286376953125,0.25701904296875,0.24288105964660645,2.016625165939331,2.346097230911255,0.08984041213989258,0.12016701698303223,0.09114742279052734,0.11654353141784668,0.1117851734161377 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,Tests_passed,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,True,129,1280,4680,4,True,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,True,129,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,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,9952a062b61f0c9151a5ae571b968975a0be9fb6d2fb7eb1c39fd392855f8381,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,379a2e029a26955447b9a1b506c0c56cb9af8f53a3fa34cb9747d39613dc275c,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,0.0603785514831543,0.05301380157470703,0.058934926986694336,0.04587745666503906,0.05718708038330078,0.06647109985351562,0.06812286376953125,0.25701904296875,0.24288105964660645,2.016625165939331,2.346097230911255,0.08984041213989258,0.12016701698303223,0.09114742279052734,0.11654353141784668,0.1117851734161377,0.11130714416503906,0.11380124092102051,0.12034296989440918,0.11591124534606934,0.25753021240234375,0.2555251121520996,0.2580070495605469,0.33121395111083984,0.3492286205291748,2.3172059059143066,2.644115686416626,0.11565828323364258,0.1147463321685791,0.11571455001831055,0.11524224281311035,0.11806035041809082 diff --git a/results/combined/merges_timed/minecrafter/bungeejson.csv b/results/combined/merges_timed/minecrafter/bungeejson.csv index 980d73a46b..514d92c87a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,True,True,Tests_passed,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,True,19,38,171,2,True,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,True,19,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,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,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,e86f00212d998598534b3d2a27d7f760a0c5ee615a56d2ad667fcecfeb871591,Tests_failed,f527be5b11e29e3be8753b04bfc32466955a1a596b08e1f02dc83973302d9a57,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,0.008375406265258789,0.00892186164855957,0.008960247039794922,0.01564335823059082,0.008941650390625,0.009052753448486328,0.009173393249511719,0.03178715705871582,0.06315112113952637,0.6489460468292236,0.400162935256958,0.03144645690917969,0.05449247360229492,0.03067183494567871,0.05394434928894043,0.05478048324584961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,True,True,Tests_passed,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,True,19,38,171,2,True,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,True,19,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,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,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,e86f00212d998598534b3d2a27d7f760a0c5ee615a56d2ad667fcecfeb871591,Tests_failed,f527be5b11e29e3be8753b04bfc32466955a1a596b08e1f02dc83973302d9a57,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,0.008375406265258789,0.00892186164855957,0.008960247039794922,0.01564335823059082,0.008941650390625,0.009052753448486328,0.009173393249511719,0.03178715705871582,0.06315112113952637,0.6489460468292236,0.400162935256958,0.03144645690917969,0.05449247360229492,0.03067183494567871,0.05394434928894043,0.05478048324584961,0.05579781532287598,0.0558934211730957,0.05507254600524902,0.05799555778503418,0.056029558181762695,0.056326866149902344,0.056131839752197266,0.09013223648071289,0.0863189697265625,0.831326961517334,0.45302772521972656,0.05524873733520508,0.054168701171875,0.055948734283447266,0.055683135986328125,0.05448508262634277 diff --git a/results/combined/merges_timed/mitre/http-proxy-servlet.csv b/results/combined/merges_timed/mitre/http-proxy-servlet.csv index 79b7ac7436..93aba1f94d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,True,True,True,6,37,204,2,True,6,Tests_passed,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,True,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,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,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,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,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,51ba825f6d38eb86de9c4dcca67de635eff6838f8512602f0ad5f7111b7f44f2,Tests_failed,f06eb8fa89d17a3a5d5d98e0d5fd35913c3cef63bc6d409ae8f4de83b133b824,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,0.04258990287780762,0.043234825134277344,0.04316592216491699,0.015866518020629883,0.04329991340637207,0.04605603218078613,0.045240163803100586,0.17613959312438965,0.11720490455627441,1.0983514785766602,0.5278782844543457,0.03016805648803711,0.05896282196044922,0.031152725219726562,0.059398651123046875,0.0565643310546875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,True,True,True,6,37,204,2,True,6,Tests_passed,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,True,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,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,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,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,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,51ba825f6d38eb86de9c4dcca67de635eff6838f8512602f0ad5f7111b7f44f2,Tests_failed,f06eb8fa89d17a3a5d5d98e0d5fd35913c3cef63bc6d409ae8f4de83b133b824,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,0.04258990287780762,0.043234825134277344,0.04316592216491699,0.015866518020629883,0.04329991340637207,0.04605603218078613,0.045240163803100586,0.17613959312438965,0.11720490455627441,1.0983514785766602,0.5278782844543457,0.03016805648803711,0.05896282196044922,0.031152725219726562,0.059398651123046875,0.0565643310546875,0.05551648139953613,0.05816793441772461,0.05768561363220215,0.057637691497802734,0.05810666084289551,0.0594477653503418,0.057895660400390625,0.09060931205749512,0.09059453010559082,1.301513910293579,0.5796909332275391,0.058156728744506836,0.05872654914855957,0.05878925323486328,0.0540618896484375,0.05892467498779297 diff --git a/results/combined/merges_timed/mixpanel/mixpanel-java.csv b/results/combined/merges_timed/mixpanel/mixpanel-java.csv index da7d000648..589e8b6727 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,True,True,True,7,24,77,2,True,7,Tests_passed,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,True,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,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,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Tests_failed,582ac54c96f77e8814ab0eabc18295fc08fc84ded7d2a2d305873343eebd879d,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,149e04f2d37a74d7a2b73aa36268ed5712672a869b9a319e0631eaa8828a5442,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,d3cbd61f39ef3b382351d64c77a0018cb9d854a17b3ed05ca048834c266dcf4c,Tests_failed,86cf73704e97d624fff16a4e2655097aceb995f5530e56ab13a90168d26fdad5,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,0.03998756408691406,0.03754281997680664,0.038186073303222656,0.013302803039550781,0.04013991355895996,0.030269145965576172,0.04058241844177246,0.1567070484161377,0.1077876091003418,0.6788811683654785,0.36244678497314453,0.039438724517822266,0.04065895080566406,0.039032936096191406,0.041400909423828125,0.0418705940246582 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,True,True,True,7,24,77,2,True,7,Tests_passed,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,True,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,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,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Tests_failed,582ac54c96f77e8814ab0eabc18295fc08fc84ded7d2a2d305873343eebd879d,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,149e04f2d37a74d7a2b73aa36268ed5712672a869b9a319e0631eaa8828a5442,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,d3cbd61f39ef3b382351d64c77a0018cb9d854a17b3ed05ca048834c266dcf4c,Tests_failed,86cf73704e97d624fff16a4e2655097aceb995f5530e56ab13a90168d26fdad5,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,0.03998756408691406,0.03754281997680664,0.038186073303222656,0.013302803039550781,0.04013991355895996,0.030269145965576172,0.04058241844177246,0.1567070484161377,0.1077876091003418,0.6788811683654785,0.36244678497314453,0.039438724517822266,0.04065895080566406,0.039032936096191406,0.041400909423828125,0.0418705940246582,0.03898882865905762,0.03965044021606445,0.0385584831237793,0.039241790771484375,0.03885197639465332,0.0396420955657959,0.039624691009521484,0.07035017013549805,0.07416319847106934,0.6809694766998291,0.4140303134918213,0.04012918472290039,0.039180755615234375,0.03853273391723633,0.03997993469238281,0.03829240798950195 diff --git a/results/combined/merges_timed/mjsalerno/unobot.csv b/results/combined/merges_timed/mjsalerno/unobot.csv index ba31c6b1f6..0a538ecbe8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,False,True,3,26,53,2,True,3,Tests_passed,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,True,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,True,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,f140daa966c14fb71a3217da340aae01f338f821681ddebd34a036d0eab9739a,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,a6e05f9c4944a78c64b96fe5f7a4416ae5c89c1e0b0f68034611e48a4197ee38,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,7c7ec57094e84e5c3c2504c75201556ef7ab1ac559e0f50568f4f3449c164a99,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,0.04147982597351074,0.041783809661865234,0.048081159591674805,0.015051603317260742,0.04252123832702637,0.04236173629760742,0.043619632720947266,0.17548418045043945,0.1245729923248291,2.058908700942993,0.4557759761810303,0.04289579391479492,0.04356837272644043,0.041133880615234375,0.044475555419921875,0.04342985153198242 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,False,True,3,26,53,2,True,3,Tests_passed,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,True,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,True,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,f140daa966c14fb71a3217da340aae01f338f821681ddebd34a036d0eab9739a,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,a6e05f9c4944a78c64b96fe5f7a4416ae5c89c1e0b0f68034611e48a4197ee38,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,7c7ec57094e84e5c3c2504c75201556ef7ab1ac559e0f50568f4f3449c164a99,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,0.04147982597351074,0.041783809661865234,0.048081159591674805,0.015051603317260742,0.04252123832702637,0.04236173629760742,0.043619632720947266,0.17548418045043945,0.1245729923248291,2.058908700942993,0.4557759761810303,0.04289579391479492,0.04356837272644043,0.041133880615234375,0.044475555419921875,0.04342985153198242,0.042223453521728516,0.04269218444824219,0.041846513748168945,0.042827606201171875,0.041797637939453125,0.04153704643249512,0.041458845138549805,0.0734856128692627,0.0987851619720459,1.9935007095336914,0.5103728771209717,0.04301595687866211,0.042684078216552734,0.042498111724853516,0.0421600341796875,0.04292798042297363 diff --git a/results/combined/merges_timed/mjsax/aeolus.csv b/results/combined/merges_timed/mjsax/aeolus.csv index b42599cc74..e14f6f1a0e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,True,52,160,1472,92,True,115,Tests_passed,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,True,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,True,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,50e627507ef4e7321302b898913e7674875934dd3412fd99a40efc515837c97e,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,Merge_failed,dae3a11061e690e3c2d2dc3d69dc06d0c2eed8dddc5a96561bde3e4013ddf7be,Merge_failed,c5e873822692ecc426040ffbcc9f1f26ea0aceacdbb4602c41a59ddd4c343857,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,00b8f87245e3f3e13b4b536a340dc0d1b4055da06b6a319e2e83b8bcc0681e64,Merge_failed,5747893a420fec05f37c44f62ded2edd08f481d281619972fac01f23ed8adeef,Merge_failed,c930d134fc2c01fe55ced750c488a9ba2491cb83498c5100b32a7940037fb91d,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,0.02788090705871582,0.02758193016052246,0.029208660125732422,0.03826022148132324,0.02885270118713379,0.029081344604492188,0.0302121639251709,0.3760702610015869,1.5559630393981934,18.570883750915527,2.3339905738830566,0.19072651863098145,0.31216001510620117,0.19153833389282227,0.3234710693359375,0.29790282249450684 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,True,52,160,1472,92,True,115,Tests_passed,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,True,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,True,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,50e627507ef4e7321302b898913e7674875934dd3412fd99a40efc515837c97e,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,Merge_failed,dae3a11061e690e3c2d2dc3d69dc06d0c2eed8dddc5a96561bde3e4013ddf7be,Merge_failed,c5e873822692ecc426040ffbcc9f1f26ea0aceacdbb4602c41a59ddd4c343857,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,ab003cc5a47f4b774d5f81a18d144cb1fa78a07a66a3b7cde94de608c326d65c,Merge_failed,00b8f87245e3f3e13b4b536a340dc0d1b4055da06b6a319e2e83b8bcc0681e64,Merge_failed,5747893a420fec05f37c44f62ded2edd08f481d281619972fac01f23ed8adeef,Merge_failed,c930d134fc2c01fe55ced750c488a9ba2491cb83498c5100b32a7940037fb91d,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,Merge_failed,d0d39b013378c4193b54c825cdc40cbbb33bf89f89f5ff303ddb62fc01d1a7ff,0.02788090705871582,0.02758193016052246,0.029208660125732422,0.03826022148132324,0.02885270118713379,0.029081344604492188,0.0302121639251709,0.3760702610015869,1.5559630393981934,18.570883750915527,2.3339905738830566,0.19072651863098145,0.31216001510620117,0.19153833389282227,0.3234710693359375,0.29790282249450684,0.31605052947998047,0.32337093353271484,0.3000798225402832,0.30985116958618164,0.31978845596313477,0.30092716217041016,0.30973362922668457,0.7989447116851807,1.082735300064087,21.688000679016113,2.727917432785034,0.30071163177490234,0.3141956329345703,0.323131799697876,0.2998545169830322,0.31522035598754883 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 15c9527bc1..2f8f407ef8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,True,2,15,167.0,2,True,2,Tests_passed,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,True,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,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,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,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,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,873cd95e480e14b33865e46219d7d953bc07ab945b6d60d11acec324cea33ff5,Tests_failed,99d4ed10beeb999451b89c0ed0555bf690006c46177e2370a5a2db4ef58df1fa,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,0.0421299934387207,0.04828619956970215,0.04642963409423828,0.016564130783081055,0.03888130187988281,0.049185752868652344,0.05240631103515625,0.16346192359924316,0.1122121810913086,2.5456600189208984,1.419679880142212,0.045790910720825195,0.06810665130615234,0.04622697830200195,0.06711554527282715,0.077667236328125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,True,2,15,167.0,2,True,2,Tests_passed,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,True,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,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,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,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,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,873cd95e480e14b33865e46219d7d953bc07ab945b6d60d11acec324cea33ff5,Tests_failed,99d4ed10beeb999451b89c0ed0555bf690006c46177e2370a5a2db4ef58df1fa,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,0.0421299934387207,0.04828619956970215,0.04642963409423828,0.016564130783081055,0.03888130187988281,0.049185752868652344,0.05240631103515625,0.16346192359924316,0.1122121810913086,2.5456600189208984,1.419679880142212,0.045790910720825195,0.06810665130615234,0.04622697830200195,0.06711554527282715,0.077667236328125,0.06853151321411133,0.07928657531738281,0.07965993881225586,0.08283376693725586,0.08407187461853027,0.06808805465698242,0.08592844009399414,0.12246131896972656,0.11251616477966309,2.666616201400757,1.5093698501586914,0.0750265121459961,0.07933998107910156,0.0672299861907959,0.08438968658447266,0.06344985961914062 diff --git a/results/combined/merges_timed/mlaccetti/javapns.csv b/results/combined/merges_timed/mlaccetti/javapns.csv index 19a1d97282..f6b67a92f5 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,True,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,True,22,116,350.0,11,True,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,True,22,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,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,f8ecd7717224adc59f26c0078ad799a77c5bcf59a4e026cc019bec0cd4cb988d,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,0.060803890228271484,0.058637380599975586,0.05446338653564453,0.020339488983154297,0.05191993713378906,0.0514528751373291,0.05894207954406738,0.7803995609283447,0.5950798988342285,7.25321888923645,0.5274960994720459,0.03896760940551758,0.24770212173461914,0.03802061080932617,0.24582743644714355,0.2510106563568115 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,True,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,True,22,116,350.0,11,True,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,True,22,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,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,f8ecd7717224adc59f26c0078ad799a77c5bcf59a4e026cc019bec0cd4cb988d,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,1529e028cd7ea79d9bcb1d173851486b12a86879a001d4db3d175478a8303b0c,Tests_passed,b7d3f56ea6ddf963cbf4ef67f5eff81369e2515aca18308d77954b943f1ee2d9,0.060803890228271484,0.058637380599975586,0.05446338653564453,0.020339488983154297,0.05191993713378906,0.0514528751373291,0.05894207954406738,0.7803995609283447,0.5950798988342285,7.25321888923645,0.5274960994720459,0.03896760940551758,0.24770212173461914,0.03802061080932617,0.24582743644714355,0.2510106563568115,0.23413920402526855,0.23259615898132324,0.23798871040344238,0.23882603645324707,0.23512887954711914,0.23467540740966797,0.23141932487487793,0.4210968017578125,0.48096323013305664,7.470431566238403,0.5554227828979492,0.23235368728637695,0.22888660430908203,0.2371840476989746,0.23547768592834473,0.2371068000793457 diff --git a/results/combined/merges_timed/mmastrac/nanojson.csv b/results/combined/merges_timed/mmastrac/nanojson.csv index b656db34b2..72ad16f52f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,True,21,29,190,3,True,21,Tests_passed,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,True,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,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,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,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,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,0c606050e8856c61da1445fd065aa71a219d3ffc168c8cd0baf0cf8cbb440e14,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,0.031897544860839844,0.04731917381286621,0.06467366218566895,0.026762723922729492,0.06380677223205566,0.0484166145324707,0.07474446296691895,0.238722562789917,0.1561431884765625,1.4107248783111572,0.603752613067627,0.049672842025756836,0.09574055671691895,0.04840087890625,0.09386563301086426,0.09663152694702148 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,True,21,29,190,3,True,21,Tests_passed,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,True,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,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,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,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,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,0c606050e8856c61da1445fd065aa71a219d3ffc168c8cd0baf0cf8cbb440e14,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,0.031897544860839844,0.04731917381286621,0.06467366218566895,0.026762723922729492,0.06380677223205566,0.0484166145324707,0.07474446296691895,0.238722562789917,0.1561431884765625,1.4107248783111572,0.603752613067627,0.049672842025756836,0.09574055671691895,0.04840087890625,0.09386563301086426,0.09663152694702148,0.08406543731689453,0.08648252487182617,0.09044051170349121,0.0939943790435791,0.09020328521728516,0.0916748046875,0.09262394905090332,0.14603424072265625,0.14437341690063477,1.509833574295044,0.626823902130127,0.08999252319335938,0.09177422523498535,0.08997058868408203,0.0900118350982666,0.08881807327270508 diff --git a/results/combined/merges_timed/mmazi/rescu.csv b/results/combined/merges_timed/mmazi/rescu.csv index e4232d8d3e..08a42f137a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,True,True,Tests_passed,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,True,11,41,176,3,True,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,True,11,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_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,eb8457e093ccbc6adb0fc57cc3057cf1e612a7cb99f56cf7776d6bb947e77ca5,Tests_failed,b5361818bf00550f0d778ec2ffbf361fed4d7e2e9263436ddd2c60fca6f3ad4d,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,0.04961872100830078,0.04176068305969238,0.04710125923156738,0.01975846290588379,0.047080278396606445,0.051339149475097656,0.03697347640991211,0.23429322242736816,0.17016339302062988,1.253561019897461,0.39400672912597656,0.03796792030334473,0.08456134796142578,0.03911471366882324,0.08672046661376953,0.08774089813232422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,True,True,Tests_passed,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,True,11,41,176,3,True,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,True,11,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_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,eb8457e093ccbc6adb0fc57cc3057cf1e612a7cb99f56cf7776d6bb947e77ca5,Tests_failed,b5361818bf00550f0d778ec2ffbf361fed4d7e2e9263436ddd2c60fca6f3ad4d,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,Tests_failed,bd9de29c73d4028608e2ff297b367fac7cc950d444913b1cfaff679012537091,0.04961872100830078,0.04176068305969238,0.04710125923156738,0.01975846290588379,0.047080278396606445,0.051339149475097656,0.03697347640991211,0.23429322242736816,0.17016339302062988,1.253561019897461,0.39400672912597656,0.03796792030334473,0.08456134796142578,0.03911471366882324,0.08672046661376953,0.08774089813232422,0.08136916160583496,0.08302474021911621,0.08327770233154297,0.08358144760131836,0.08489537239074707,0.0839076042175293,0.08269977569580078,0.13152813911437988,0.14316582679748535,1.3174679279327393,0.4177260398864746,0.08245229721069336,0.08225798606872559,0.08284759521484375,0.08392786979675293,0.08377838134765625 diff --git a/results/combined/merges_timed/mmlab/rmlprocessor.csv b/results/combined/merges_timed/mmlab/rmlprocessor.csv index 372b926896..194991b6cf 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,True,True,Tests_passed,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,True,43,245,942,5,True,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,True,43,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,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,369aa418b9612743d93c372820e04b7bbc022971697ac9c26d2a7144a7cc9301,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,da4c5388002fa6c7a17458583ba2e753b0ca3e7e68b8cc6ea498ae3629df5021,Merge_timedout,,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,0.04576897621154785,0.06780242919921875,0.05227470397949219,0.02352309226989746,0.06319379806518555,0.048416852951049805,0.03875303268432617,0.388427734375,0.2899017333984375,3.721930503845215,-1.0,0.06611084938049316,0.12019205093383789,0.05212044715881348,0.11873102188110352,0.12180233001708984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,True,True,Tests_passed,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,True,43,245,942,5,True,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,True,43,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,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,369aa418b9612743d93c372820e04b7bbc022971697ac9c26d2a7144a7cc9301,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,da4c5388002fa6c7a17458583ba2e753b0ca3e7e68b8cc6ea498ae3629df5021,Merge_timedout,,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,0.04576897621154785,0.06780242919921875,0.05227470397949219,0.02352309226989746,0.06319379806518555,0.048416852951049805,0.03875303268432617,0.388427734375,0.2899017333984375,3.721930503845215,-1.0,0.06611084938049316,0.12019205093383789,0.05212044715881348,0.11873102188110352,0.12180233001708984,0.12461566925048828,0.12133622169494629,0.12646913528442383,0.12247729301452637,0.12631869316101074,0.12075948715209961,0.12427830696105957,0.21421074867248535,0.24587392807006836,4.18096137046814,-1.0,0.12200450897216797,0.1228334903717041,0.1236259937286377,0.11945867538452148,0.12275266647338867 diff --git a/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv b/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv index 15dc786f18..b5f4c2f69d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,True,True,True,4,20,106,2,True,4,Tests_passed,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,True,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,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,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_timedout,,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,77cdc00002a17c1b5d0f52e17839cbfd22499a026762b5f08fdd91a7a1ef70bf,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,09879e4a4747bf40ca901fa5341c06bf7180eb6e93709e3153ab86b9798ee1bc,Merge_timedout,,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.021059751510620117,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.12360334396362305,1.5209083557128906,-1.0,0.05021810531616211,0.0494534969329834,0.04417300224304199,0.05145382881164551,0.04633164405822754 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,True,True,True,4,20,106,2,True,4,Tests_passed,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,True,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,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,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_timedout,,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,77cdc00002a17c1b5d0f52e17839cbfd22499a026762b5f08fdd91a7a1ef70bf,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,09879e4a4747bf40ca901fa5341c06bf7180eb6e93709e3153ab86b9798ee1bc,Merge_timedout,,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.021059751510620117,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.12360334396362305,1.5209083557128906,-1.0,0.05021810531616211,0.0494534969329834,0.04417300224304199,0.05145382881164551,0.04633164405822754,0.04984903335571289,0.04872536659240723,0.049288272857666016,0.04415392875671387,0.05061149597167969,0.05059099197387695,0.05045819282531738,0.08431148529052734,0.08610916137695312,1.4642021656036377,-1.0,0.04963541030883789,0.04651808738708496,0.050983428955078125,0.04924178123474121,0.04778552055358887 diff --git a/results/combined/merges_timed/mongobee/mongobee.csv b/results/combined/merges_timed/mongobee/mongobee.csv index 42ca19ef18..b7729df4b8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,True,11,64,592,3,True,11,Tests_passed,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,True,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,True,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,73db6dce3f4fe4840a549ed22ff1354966d58a311716ff5c4be5ea84c5b8aaad,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Tests_failed,7ca05e650490dddc4d2fae05c41677fedfc29748fbf0837522051458a1d4fb9d,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,b4536b61e90adb379267e1e0579fb244397bd50d79e52188936aa69f6bf83d40,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,4bcfbb366f455e809d0fb5d5c4fd2990290c81f949f951689f25d5559f4c9410,Tests_failed,c3358b9f92e4cfa9ffb678831e9540a766e7bf3a0cdc649fefaee1b9295226ca,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,0.04684329032897949,0.045816898345947266,0.040709495544433594,0.021898746490478516,0.0359959602355957,0.040045738220214844,0.044884681701660156,0.23576140403747559,0.1766963005065918,1.3892931938171387,0.37219691276550293,0.06260323524475098,0.06096005439758301,0.0632333755493164,0.06087899208068848,0.07338190078735352 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,True,11,64,592,3,True,11,Tests_passed,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,True,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,True,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,73db6dce3f4fe4840a549ed22ff1354966d58a311716ff5c4be5ea84c5b8aaad,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Tests_failed,7ca05e650490dddc4d2fae05c41677fedfc29748fbf0837522051458a1d4fb9d,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,b4536b61e90adb379267e1e0579fb244397bd50d79e52188936aa69f6bf83d40,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,4bcfbb366f455e809d0fb5d5c4fd2990290c81f949f951689f25d5559f4c9410,Tests_failed,c3358b9f92e4cfa9ffb678831e9540a766e7bf3a0cdc649fefaee1b9295226ca,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,0.04684329032897949,0.045816898345947266,0.040709495544433594,0.021898746490478516,0.0359959602355957,0.040045738220214844,0.044884681701660156,0.23576140403747559,0.1766963005065918,1.3892931938171387,0.37219691276550293,0.06260323524475098,0.06096005439758301,0.0632333755493164,0.06087899208068848,0.07338190078735352,0.06139206886291504,0.07161426544189453,0.061788320541381836,0.07423210144042969,0.06314969062805176,0.06276226043701172,0.06279802322387695,0.11284375190734863,0.13067269325256348,1.5151500701904297,0.4847376346588135,0.06173348426818848,0.0611112117767334,0.059565067291259766,0.06244468688964844,0.07184839248657227 diff --git a/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv b/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv index ae77cc939f..a4cc198dc5 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -47,refs/heads/master,0ddd3bd015cc0a792db62c6a5988844478e7d388,8a016a98cd4c187894853bfcefb543dd43277519,f44c06b09b95cdd8c943957fa81e46aaf8feb552,,True,True,Tests_passed,ea23a0b0bfe6a0c4fdfb0191726b93d411ebf26f98c077e7520bb92f107b90cb,True,5,10,70,3,True,Tests_passed,cc7214658eb15b1919ae7460e98fb19dc3a1b929346bbcc8517b2f6c08b398ab,True,5,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,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_failed,98c146fe06d7f1797b889b3a9d4f0adba932b58c4d7be28e02565fb81ec4f35c,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,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,6a187976d21a2d3a389007bdd9454c0e474d8c3742da5e7160fc39373da892ce,Tests_failed,98c146fe06d7f1797b889b3a9d4f0adba932b58c4d7be28e02565fb81ec4f35c,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,0.013883829116821289,0.014308452606201172,0.016765594482421875,0.021561384201049805,0.01636481285095215,0.016234159469604492,0.016750097274780273,0.060468196868896484,0.12865805625915527,2.324634313583374,0.3955812454223633,0.04281282424926758,0.08999252319335938,0.04277801513671875,0.08767938613891602,0.08904480934143066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +47,refs/heads/master,0ddd3bd015cc0a792db62c6a5988844478e7d388,8a016a98cd4c187894853bfcefb543dd43277519,f44c06b09b95cdd8c943957fa81e46aaf8feb552,,True,True,Tests_passed,ea23a0b0bfe6a0c4fdfb0191726b93d411ebf26f98c077e7520bb92f107b90cb,True,5,10,70,3,True,Tests_passed,cc7214658eb15b1919ae7460e98fb19dc3a1b929346bbcc8517b2f6c08b398ab,True,5,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,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_failed,98c146fe06d7f1797b889b3a9d4f0adba932b58c4d7be28e02565fb81ec4f35c,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,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,6a187976d21a2d3a389007bdd9454c0e474d8c3742da5e7160fc39373da892ce,Tests_failed,98c146fe06d7f1797b889b3a9d4f0adba932b58c4d7be28e02565fb81ec4f35c,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,0.013883829116821289,0.014308452606201172,0.016765594482421875,0.021561384201049805,0.01636481285095215,0.016234159469604492,0.016750097274780273,0.060468196868896484,0.12865805625915527,2.324634313583374,0.3955812454223633,0.04281282424926758,0.08999252319335938,0.04277801513671875,0.08767938613891602,0.08904480934143066,0.08412694931030273,0.08660531044006348,0.08819317817687988,0.08623147010803223,0.08404302597045898,0.08626174926757812,0.08229780197143555,0.13812637329101562,0.14030933380126953,2.1152870655059814,0.43694257736206055,0.08480381965637207,0.0857381820678711,0.08457803726196289,0.08449029922485352,0.08525824546813965 diff --git a/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv b/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv index 493c6dd42c..137003fb4d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,True,False,Tests_passed,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,True,4,8,58,7,True,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,True,8,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,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,9dea9bd0be029900ea06a9cef30a869d80219e6df69ec5e90cbd90ab7bdf36f5,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,0.03983640670776367,0.04173541069030762,0.04349946975708008,0.014308452606201172,0.042281389236450195,0.04378938674926758,0.039635658264160156,0.2342386245727539,0.16608190536499023,0.4651765823364258,0.3682553768157959,0.030148744583129883,0.0700678825378418,0.03005385398864746,0.07272028923034668,0.0710148811340332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,True,False,Tests_passed,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,True,4,8,58,7,True,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,True,8,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,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,9dea9bd0be029900ea06a9cef30a869d80219e6df69ec5e90cbd90ab7bdf36f5,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,1291c6283b4939dbfc200e49eaa307eb81319bf92cbaf67d37af5572c40bf9b7,Tests_passed,e6e8dae634b398c94269d948cb653936cd14987fa0d1d4cd30f06ee7c50c406a,0.03983640670776367,0.04173541069030762,0.04349946975708008,0.014308452606201172,0.042281389236450195,0.04378938674926758,0.039635658264160156,0.2342386245727539,0.16608190536499023,0.4651765823364258,0.3682553768157959,0.030148744583129883,0.0700678825378418,0.03005385398864746,0.07272028923034668,0.0710148811340332,0.07246685028076172,0.0739753246307373,0.07247352600097656,0.07276248931884766,0.07297420501708984,0.07262849807739258,0.07248449325561523,0.12263321876525879,0.13427019119262695,0.5246033668518066,0.42584776878356934,0.07126545906066895,0.07314181327819824,0.07080459594726562,0.07236957550048828,0.0714418888092041 diff --git a/results/combined/merges_timed/mooso/azure-tables-hadoop.csv b/results/combined/merges_timed/mooso/azure-tables-hadoop.csv index 530f80a563..a898817be6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,True,True,Tests_passed,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,True,15,52,251,20,True,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,True,24,True,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,f1006de1c2c8ec5ac47f3e180e3985bf486bb53e2c869baf6e5752f15321e7a0,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_timedout,,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,148068da1884fc229a2ccd81639dafab42a49a57857e00fb683f229269054884,Merge_failed,a89c8ea079259cf07c3546632dab972bb53224037847e28dde78fd3fdcd0cf96,Merge_failed,51001575945c6f4fdff95b64a5fb0395336c527f5f7979a6e909b1c2f4099b4e,Merge_timedout,,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,0.041785478591918945,0.04632234573364258,0.03166317939758301,0.015013933181762695,0.03222918510437012,0.038799285888671875,0.04024386405944824,0.7250766754150391,0.6221773624420166,4.528571844100952,-1.0,0.09697508811950684,0.1934201717376709,0.09644007682800293,0.19504594802856445,0.19743013381958008 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,True,True,Tests_passed,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,True,15,52,251,20,True,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,True,24,True,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,f1006de1c2c8ec5ac47f3e180e3985bf486bb53e2c869baf6e5752f15321e7a0,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_timedout,,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,148068da1884fc229a2ccd81639dafab42a49a57857e00fb683f229269054884,Merge_failed,a89c8ea079259cf07c3546632dab972bb53224037847e28dde78fd3fdcd0cf96,Merge_failed,51001575945c6f4fdff95b64a5fb0395336c527f5f7979a6e909b1c2f4099b4e,Merge_timedout,,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,1c6c9e178a043d64fc6d31decad0c67b9921a469a2c70814184e2474a8ff618a,Merge_failed,3820a3f7cb934799dc6439d312613b2f35e127a766b3a8d8d3635704184f5754,0.041785478591918945,0.04632234573364258,0.03166317939758301,0.015013933181762695,0.03222918510437012,0.038799285888671875,0.04024386405944824,0.7250766754150391,0.6221773624420166,4.528571844100952,-1.0,0.09697508811950684,0.1934201717376709,0.09644007682800293,0.19504594802856445,0.19743013381958008,0.1968839168548584,0.2015056610107422,0.19919753074645996,0.19683051109313965,0.19662046432495117,0.19637751579284668,0.19880199432373047,0.37880468368530273,0.4707210063934326,5.250694274902344,-1.0,0.20060086250305176,0.19406819343566895,0.19308185577392578,0.19930458068847656,0.1985788345336914 diff --git a/results/combined/merges_timed/moquette-io/moquette.csv b/results/combined/merges_timed/moquette-io/moquette.csv index 449ec58930..17e343fb50 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,True,20,45,219,2,True,20,Tests_passed,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,True,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,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,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,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,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,6f4b961d684d2c854f1f9b54de6678519bf6ed891b76320fa4b0aa2b56352bf8,Tests_failed,e0a78233d8d9bc3bc7555665bba491bdae7f7f28350e93b2f919768aa66c4ced,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.02850794792175293,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.10495758056640625,0.9524059295654297,0.559014081954956,0.04884147644042969,0.07618069648742676,0.037952423095703125,0.06405973434448242,0.07214856147766113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,True,20,45,219,2,True,20,Tests_passed,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,True,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,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,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,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,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,6f4b961d684d2c854f1f9b54de6678519bf6ed891b76320fa4b0aa2b56352bf8,Tests_failed,e0a78233d8d9bc3bc7555665bba491bdae7f7f28350e93b2f919768aa66c4ced,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.02850794792175293,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.10495758056640625,0.9524059295654297,0.559014081954956,0.04884147644042969,0.07618069648742676,0.037952423095703125,0.06405973434448242,0.07214856147766113,0.0692746639251709,0.07245182991027832,0.06020641326904297,0.06136918067932129,0.07521414756774902,0.07666349411010742,0.07859945297241211,0.09613752365112305,0.10625457763671875,0.9548430442810059,0.5919325351715088,0.06110501289367676,0.07153677940368652,0.07383275032043457,0.0615382194519043,0.059287309646606445 diff --git a/results/combined/merges_timed/morfologik/morfologik-stemming.csv b/results/combined/merges_timed/morfologik/morfologik-stemming.csv index df9fd1ec2f..1096970de5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,True,3,35,260,2,True,3,Tests_passed,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,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,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,697c0a4cc18cf38a139a441e80feba47b2d413dfcdf6f9f796fd1fc4eb0bec30,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,1e5a5bb7bdee74ee979980b15b47ebdadf20f8827daec0d9fa040d1e095ca0b6,Tests_failed,48a59d00f56eb66987c0d527446deb9ad68ae4cbd964ebc66b003a6947c93026,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,0.01014399528503418,0.04837512969970703,0.01155543327331543,0.08327627182006836,0.06724739074707031,0.06992793083190918,0.029551267623901367,0.13885116577148438,0.10812973976135254,1.372253656387329,1.1862690448760986,0.11811637878417969,0.06459283828735352,0.1192624568939209,0.1446218490600586,0.0652463436126709 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,True,3,35,260,2,True,3,Tests_passed,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,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,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,697c0a4cc18cf38a139a441e80feba47b2d413dfcdf6f9f796fd1fc4eb0bec30,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,1e5a5bb7bdee74ee979980b15b47ebdadf20f8827daec0d9fa040d1e095ca0b6,Tests_failed,48a59d00f56eb66987c0d527446deb9ad68ae4cbd964ebc66b003a6947c93026,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,a50e232ab550b5cca7907f0658984eab78ac5987f4ab24a496925cc48ab81ee1,Tests_passed,487b7bf808735b4d0138c25485461b8c1377e847097eb75995320594c61615f4,0.01014399528503418,0.04837512969970703,0.01155543327331543,0.08327627182006836,0.06724739074707031,0.06992793083190918,0.029551267623901367,0.13885116577148438,0.10812973976135254,1.372253656387329,1.1862690448760986,0.11811637878417969,0.06459283828735352,0.1192624568939209,0.1446218490600586,0.0652463436126709,0.1471548080444336,0.1442561149597168,0.1090545654296875,0.15996217727661133,0.16367030143737793,0.060750484466552734,0.1585547924041748,0.21925067901611328,0.18759703636169434,1.392232894897461,1.2068538665771484,0.13915705680847168,0.1474442481994629,0.06193351745605469,0.1427147388458252,0.15386629104614258 diff --git a/results/combined/merges_timed/moritanosuke/glacieruploader.csv b/results/combined/merges_timed/moritanosuke/glacieruploader.csv index c60fa7e7b7..855cdbe8fd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,Tests_passed,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,True,7,20,78.0,3,True,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,True,7,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,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Tests_failed,e5bff27185dd5b53d61637e7cf77b071c6d291a7cfb9096a17fc9f871e81b39f,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,918a2843d862804805b268071b6aa295a71fd3f29eff2103bee8247aecd92c78,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,4fc070665261729ed101398562a4ee6795cba423f3e869b3179da2f2720a5fab,Tests_failed,a97eda4d208f221322af24cda9bd08c121f4ce9a751899fe69c35c760c38047d,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,0.03562283515930176,0.042084693908691406,0.036934852600097656,0.012988090515136719,0.011941671371459961,0.037325382232666016,0.035614013671875,0.23298859596252441,0.17133188247680664,1.0644934177398682,0.25279736518859863,0.0392305850982666,0.05923628807067871,0.03971123695373535,0.05959010124206543,0.06091666221618652 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,Tests_passed,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,True,7,20,78.0,3,True,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,True,7,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,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Tests_failed,e5bff27185dd5b53d61637e7cf77b071c6d291a7cfb9096a17fc9f871e81b39f,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,918a2843d862804805b268071b6aa295a71fd3f29eff2103bee8247aecd92c78,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,4fc070665261729ed101398562a4ee6795cba423f3e869b3179da2f2720a5fab,Tests_failed,a97eda4d208f221322af24cda9bd08c121f4ce9a751899fe69c35c760c38047d,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,0.03562283515930176,0.042084693908691406,0.036934852600097656,0.012988090515136719,0.011941671371459961,0.037325382232666016,0.035614013671875,0.23298859596252441,0.17133188247680664,1.0644934177398682,0.25279736518859863,0.0392305850982666,0.05923628807067871,0.03971123695373535,0.05959010124206543,0.06091666221618652,0.05666208267211914,0.057424306869506836,0.056871891021728516,0.0569767951965332,0.057024478912353516,0.05862545967102051,0.05606436729431152,0.10436773300170898,0.11496162414550781,1.0895006656646729,0.335308313369751,0.05651259422302246,0.05897808074951172,0.05905270576477051,0.05633234977722168,0.05723237991333008 diff --git a/results/combined/merges_timed/motown-io/motown.csv b/results/combined/merges_timed/motown-io/motown.csv index 530dde08f2..eed40b0298 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,True,True,True,59,192,731,2,True,59,Tests_passed,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,True,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,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,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,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,405f3b15b440dc1a4201f3bbc200d23a5b818c678303a8a6450bb9aa4aade53f,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,0.07253742218017578,0.08007264137268066,0.07462525367736816,0.03354310989379883,0.08158636093139648,0.07148861885070801,0.07883977890014648,0.22618317604064941,0.1502077579498291,0.6540679931640625,1.2994506359100342,0.0600130558013916,0.08236479759216309,0.06338214874267578,0.08411192893981934,0.08576774597167969 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,True,True,True,59,192,731,2,True,59,Tests_passed,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,True,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,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,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,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,405f3b15b440dc1a4201f3bbc200d23a5b818c678303a8a6450bb9aa4aade53f,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,0.07253742218017578,0.08007264137268066,0.07462525367736816,0.03354310989379883,0.08158636093139648,0.07148861885070801,0.07883977890014648,0.22618317604064941,0.1502077579498291,0.6540679931640625,1.2994506359100342,0.0600130558013916,0.08236479759216309,0.06338214874267578,0.08411192893981934,0.08576774597167969,0.08561110496520996,0.0838782787322998,0.0879051685333252,0.08881449699401855,0.08782148361206055,0.08762454986572266,0.08704233169555664,0.13199901580810547,0.12349605560302734,0.7830953598022461,1.3587393760681152,0.08468961715698242,0.08757591247558594,0.08667850494384766,0.08864974975585938,0.08642125129699707 diff --git a/results/combined/merges_timed/movsim/movsim.csv b/results/combined/merges_timed/movsim/movsim.csv index 8d7e43fd0a..f41fe578be 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -194,refs/heads/develop,f65dfc825dcaa8a267f5fba4694b112528f3189c,11f108e83b85fd4f50a883fcdda9110f0d334146,54ff56818521387e816bae3400d078cdda1968e3,,True,True,True,2,3,20,22,True,22,Tests_passed,364de8ef6f4805b6c793d210d2447e0c3455f830342ece8e72b6162611b8d669,True,Tests_passed,b1ea70fe76e2c6d08d006b4179f5f2381f2234f3c1ab09ed2d2b1ccd5108f700,True,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,0c1b0f1cc992f4d90e5fd8b3e8b342bbca86e5df2e2e0268278e57a612b9a266,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,18f8f09ef7c4a519ec67d0fb20b46ce52e6ce5d1c93ef4674e593351dca53040,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,b74dbae239838b24c7a8032fa26eafd56f9a0d036073bd68e18f40c602180f46,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Tests_passed,67b1f8e9fb17637d03c0f8cf71bf1c997689c1776350e999a9978d698cfd7140,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,0.04309225082397461,0.04737401008605957,0.048781633377075195,0.01618504524230957,0.049712419509887695,0.046521663665771484,0.04688882827758789,0.21288394927978516,0.12060189247131348,0.761162519454956,0.3404996395111084,0.04393196105957031,0.04425764083862305,0.04307198524475098,0.04493379592895508,0.04512643814086914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +194,refs/heads/develop,f65dfc825dcaa8a267f5fba4694b112528f3189c,11f108e83b85fd4f50a883fcdda9110f0d334146,54ff56818521387e816bae3400d078cdda1968e3,,True,True,True,2,3,20,22,True,22,Tests_passed,364de8ef6f4805b6c793d210d2447e0c3455f830342ece8e72b6162611b8d669,True,Tests_passed,b1ea70fe76e2c6d08d006b4179f5f2381f2234f3c1ab09ed2d2b1ccd5108f700,True,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,0c1b0f1cc992f4d90e5fd8b3e8b342bbca86e5df2e2e0268278e57a612b9a266,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,18f8f09ef7c4a519ec67d0fb20b46ce52e6ce5d1c93ef4674e593351dca53040,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,b74dbae239838b24c7a8032fa26eafd56f9a0d036073bd68e18f40c602180f46,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Tests_passed,67b1f8e9fb17637d03c0f8cf71bf1c997689c1776350e999a9978d698cfd7140,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,0.04309225082397461,0.04737401008605957,0.048781633377075195,0.01618504524230957,0.049712419509887695,0.046521663665771484,0.04688882827758789,0.21288394927978516,0.12060189247131348,0.761162519454956,0.3404996395111084,0.04393196105957031,0.04425764083862305,0.04307198524475098,0.04493379592895508,0.04512643814086914,0.04361081123352051,0.04341459274291992,0.04433774948120117,0.050817251205444336,0.05087566375732422,0.05194520950317383,0.043675899505615234,0.08474254608154297,0.0861668586730957,0.8019812107086182,0.41619420051574707,0.044149160385131836,0.04358649253845215,0.043758392333984375,0.04248976707458496,0.04080462455749512 diff --git a/results/combined/merges_timed/mpatric/mp3agic.csv b/results/combined/merges_timed/mpatric/mp3agic.csv index 903e53cbdd..7a753baec9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,True,True,Tests_passed,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,True,8,85,437,2,True,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,True,8,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,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,80801042ba0b0684420f9e6ccd338130454591fbc3b6c417ba49939222605ebf,Tests_failed,258f9ff871c57450ed1459c346bcfbdaf7ab1227057cda230deb3511ec7ebeae,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,0.013562679290771484,0.01330876350402832,0.0158233642578125,0.023404359817504883,0.015661239624023438,0.015368461608886719,0.016190290451049805,0.04239988327026367,0.06810164451599121,1.453890085220337,0.607781171798706,0.04203534126281738,0.07397699356079102,0.04279470443725586,0.07317614555358887,0.07831645011901855 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,True,True,Tests_passed,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,True,8,85,437,2,True,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,True,8,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,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,80801042ba0b0684420f9e6ccd338130454591fbc3b6c417ba49939222605ebf,Tests_failed,258f9ff871c57450ed1459c346bcfbdaf7ab1227057cda230deb3511ec7ebeae,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,Tests_passed,cf52b169a908559cfa32b4356523edee0a22b4345e9a342b60adfe8671d9fcf5,0.013562679290771484,0.01330876350402832,0.0158233642578125,0.023404359817504883,0.015661239624023438,0.015368461608886719,0.016190290451049805,0.04239988327026367,0.06810164451599121,1.453890085220337,0.607781171798706,0.04203534126281738,0.07397699356079102,0.04279470443725586,0.07317614555358887,0.07831645011901855,0.07002472877502441,0.06939077377319336,0.07733654975891113,0.07254290580749512,0.07522940635681152,0.07647967338562012,0.07408809661865234,0.10641098022460938,0.10751581192016602,1.552624225616455,0.6733212471008301,0.07399296760559082,0.07232427597045898,0.07213592529296875,0.069793701171875,0.06791019439697266 diff --git a/results/combined/merges_timed/mpusher/mpush.csv b/results/combined/merges_timed/mpusher/mpush.csv index 54825cba16..6bd872b674 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,True,155,580,6042.0,14,True,158,Tests_passed,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,True,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,True,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,368a9aca43a4d3394a97290dc99d9c9849ff8ee326ade7aa49d897ff7175d56a,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,Merge_failed,6caaa126048582725c26deaf53a73a8733b1d9329b5e9dd73fbd2a6dedf58302,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,71e0c82407531282607a1517c764b40544bd9c9ac2169369f66f750f7af36e2a,Merge_failed,8f7de7c724f9bfd5dc96cccaf6b8cd00318cf5da7f0bd06a34e246ed62be7860,Merge_failed,c8e9e05044d8b743a8b2050d3010a67f61d854c4059484197d045ff794302dab,Merge_failed,e41d3f4154eeb360f20ce4c3f0e91ef5ad7c10f0577ed8804a3b46f545da5fcb,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.03388643264770508,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.6969237327575684,5.425331354141235,1.2977619171142578,0.10711336135864258,0.2538716793060303,0.10517764091491699,0.2484743595123291,0.2629098892211914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,True,155,580,6042.0,14,True,158,Tests_passed,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,True,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,True,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,368a9aca43a4d3394a97290dc99d9c9849ff8ee326ade7aa49d897ff7175d56a,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,Merge_failed,6caaa126048582725c26deaf53a73a8733b1d9329b5e9dd73fbd2a6dedf58302,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,71e0c82407531282607a1517c764b40544bd9c9ac2169369f66f750f7af36e2a,Merge_failed,8f7de7c724f9bfd5dc96cccaf6b8cd00318cf5da7f0bd06a34e246ed62be7860,Merge_failed,c8e9e05044d8b743a8b2050d3010a67f61d854c4059484197d045ff794302dab,Merge_failed,e41d3f4154eeb360f20ce4c3f0e91ef5ad7c10f0577ed8804a3b46f545da5fcb,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,Merge_failed,6ad66b06701cf14b91578017d9db8c8483ee19971057fc76ad2425b68611aa19,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.03388643264770508,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.6969237327575684,5.425331354141235,1.2977619171142578,0.10711336135864258,0.2538716793060303,0.10517764091491699,0.2484743595123291,0.2629098892211914,0.241441011428833,0.2400352954864502,0.23844337463378906,0.23982000350952148,0.24154043197631836,0.24135255813598633,0.24113726615905762,0.44869446754455566,0.5258688926696777,5.45166277885437,1.569225788116455,0.24005341529846191,0.24779772758483887,0.23758888244628906,0.24094271659851074,0.23821735382080078 diff --git a/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv b/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv index 08793da352..019b581815 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -95,refs/heads/master,affa3af06c5f08748b89a2b739cd0ffa4c22ffa0,5f525fbf748f920ca1f2260a4501daee22c7aa31,58fde5cbdf8d5b83f692893081f7c476b34f60bd,,True,False,Tests_passed,9bfad9bd915b5d2c182b82535d36d6770a8ba1a81f136a1b179b811e3a6441c2,True,24,40,113,8,True,Tests_passed,c75056464942075194dac961defd6b49323ce5c1b4a132056eb8e2f3de00fb23,True,30,True,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,b4e52e4d6aaf244a86ab7d4d1f28ccbc01c06082e824a5481c9a9e3ff60e2fb1,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,8137b3fb9bc659f3c50a0e14bf1b7e056d578f19749ed2badc369f607e1c0e4c,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,9d24ab982e5302a21c4324a46f2ba9fb97b1828b83286f5d02d2d3ac8b545184,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,a0834f16e28b9ec151665909265ceaf34ce8f6d1d31540dee02d34f5d7208edc,Tests_passed,8137b3fb9bc659f3c50a0e14bf1b7e056d578f19749ed2badc369f607e1c0e4c,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,0.016453981399536133,0.01661849021911621,0.019764184951782227,0.02714681625366211,0.01908135414123535,0.019076824188232422,0.019489526748657227,0.08489012718200684,0.0710153579711914,2.894188404083252,0.6295294761657715,0.04729151725769043,0.07182693481445312,0.04782414436340332,0.07214212417602539,0.07316708564758301 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +95,refs/heads/master,affa3af06c5f08748b89a2b739cd0ffa4c22ffa0,5f525fbf748f920ca1f2260a4501daee22c7aa31,58fde5cbdf8d5b83f692893081f7c476b34f60bd,,True,False,Tests_passed,9bfad9bd915b5d2c182b82535d36d6770a8ba1a81f136a1b179b811e3a6441c2,True,24,40,113,8,True,Tests_passed,c75056464942075194dac961defd6b49323ce5c1b4a132056eb8e2f3de00fb23,True,30,True,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,b4e52e4d6aaf244a86ab7d4d1f28ccbc01c06082e824a5481c9a9e3ff60e2fb1,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,8137b3fb9bc659f3c50a0e14bf1b7e056d578f19749ed2badc369f607e1c0e4c,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,9d24ab982e5302a21c4324a46f2ba9fb97b1828b83286f5d02d2d3ac8b545184,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,a0834f16e28b9ec151665909265ceaf34ce8f6d1d31540dee02d34f5d7208edc,Tests_passed,8137b3fb9bc659f3c50a0e14bf1b7e056d578f19749ed2badc369f607e1c0e4c,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,0.016453981399536133,0.01661849021911621,0.019764184951782227,0.02714681625366211,0.01908135414123535,0.019076824188232422,0.019489526748657227,0.08489012718200684,0.0710153579711914,2.894188404083252,0.6295294761657715,0.04729151725769043,0.07182693481445312,0.04782414436340332,0.07214212417602539,0.07316708564758301,0.07337236404418945,0.07170367240905762,0.0750875473022461,0.07539010047912598,0.07611918449401855,0.07369279861450195,0.07522296905517578,0.11356139183044434,0.10832381248474121,3.571558713912964,0.7273693084716797,0.07439637184143066,0.07127141952514648,0.0736534595489502,0.07233047485351562,0.07297277450561523 diff --git a/results/combined/merges_timed/mrice/license-check.csv b/results/combined/merges_timed/mrice/license-check.csv index f98b59fe7f..c71f862eb4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,True,True,True,9,61,1247,5,True,9,Tests_passed,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,True,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,True,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,e9ebdb3e3b7750d9a8ccf4e7ac566f3f673633a662dc86abbcb800bb95c86651,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,Merge_failed,18810f642d67839d0dbfdc06338ac35097f8b075d2819e21e3e49cdeeacd4d2b,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,566c26d38e550b0eafe44c09f3b0b60462869240c220d18d09ae4c067f825add,Merge_failed,52391e762814c2b08465c926dd82ae3561e896f21c252236a0441f0d1d3513a3,Merge_failed,52391e762814c2b08465c926dd82ae3561e896f21c252236a0441f0d1d3513a3,Merge_failed,0cf100864db66d0f52662649d3a0f3587e625bf677854324effe251762b2e125,Merge_failed,1c199d2c14334ed4402aca93dbcc3ee32f96f0e8c58c5ef4dbb8f2b9205d3e38,Merge_failed,f5c7aed32a5d13554588b808705c48a10c8d97bee7992957a12b71c5d2240347,Merge_failed,4af97b3ab458e496579a6fb8ec934b997f5aeed12ad3299edf2c20b45272c652,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,0.009112834930419922,0.00920557975769043,0.009064912796020508,0.015358686447143555,0.00896453857421875,0.008858680725097656,0.009211301803588867,0.06258416175842285,0.1844344139099121,1.0618185997009277,0.4611384868621826,0.07549118995666504,0.06847953796386719,0.08961892127990723,0.0991513729095459,0.08939075469970703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,True,True,True,9,61,1247,5,True,9,Tests_passed,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,True,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,True,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,e9ebdb3e3b7750d9a8ccf4e7ac566f3f673633a662dc86abbcb800bb95c86651,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,Merge_failed,18810f642d67839d0dbfdc06338ac35097f8b075d2819e21e3e49cdeeacd4d2b,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,566c26d38e550b0eafe44c09f3b0b60462869240c220d18d09ae4c067f825add,Merge_failed,52391e762814c2b08465c926dd82ae3561e896f21c252236a0441f0d1d3513a3,Merge_failed,52391e762814c2b08465c926dd82ae3561e896f21c252236a0441f0d1d3513a3,Merge_failed,0cf100864db66d0f52662649d3a0f3587e625bf677854324effe251762b2e125,Merge_failed,1c199d2c14334ed4402aca93dbcc3ee32f96f0e8c58c5ef4dbb8f2b9205d3e38,Merge_failed,f5c7aed32a5d13554588b808705c48a10c8d97bee7992957a12b71c5d2240347,Merge_failed,4af97b3ab458e496579a6fb8ec934b997f5aeed12ad3299edf2c20b45272c652,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,734ca208f6cc82c2fa3b6226b5c84bf38211c13402fd76dc22eac645b877c264,Merge_failed,2c71b0c7114eb1157cef755cf6b928258cf6e8ef3c73a9bf6ad988090db8cd7c,0.009112834930419922,0.00920557975769043,0.009064912796020508,0.015358686447143555,0.00896453857421875,0.008858680725097656,0.009211301803588867,0.06258416175842285,0.1844344139099121,1.0618185997009277,0.4611384868621826,0.07549118995666504,0.06847953796386719,0.08961892127990723,0.0991513729095459,0.08939075469970703,0.09768080711364746,0.08426475524902344,0.10045790672302246,0.08636283874511719,0.1398632526397705,0.13892507553100586,0.35712265968322754,0.21078228950500488,0.23617029190063477,1.1854515075683594,0.547076940536499,0.09935522079467773,0.09674859046936035,0.09743714332580566,0.09998202323913574,0.08305931091308594 diff --git a/results/combined/merges_timed/mrpdaemon/encfs-java.csv b/results/combined/merges_timed/mrpdaemon/encfs-java.csv index 90982d28aa..d670f7c441 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,,True,13,48,,9,True,17,Tests_passed,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,True,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,True,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,a98f605b38afe699cae6d46d04aaa93dbb3e5308c18347bb50de110ef46450c2,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,660212fbd652c8599ad6ddca915502186e899ca012015aa55efea283fa2376b1,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,0.05002546310424805,0.043054819107055664,0.053536415100097656,0.016613006591796875,0.050383567810058594,0.053037166595458984,0.04908275604248047,0.3576362133026123,0.28838372230529785,2.8846359252929688,0.7883889675140381,0.06795907020568848,0.06708335876464844,0.17308616638183594,0.1706392765045166,0.06870150566101074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,,True,13,48,,9,True,17,Tests_passed,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,True,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,True,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,a98f605b38afe699cae6d46d04aaa93dbb3e5308c18347bb50de110ef46450c2,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,660212fbd652c8599ad6ddca915502186e899ca012015aa55efea283fa2376b1,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,0.05002546310424805,0.043054819107055664,0.053536415100097656,0.016613006591796875,0.050383567810058594,0.053037166595458984,0.04908275604248047,0.3576362133026123,0.28838372230529785,2.8846359252929688,0.7883889675140381,0.06795907020568848,0.06708335876464844,0.17308616638183594,0.1706392765045166,0.06870150566101074,0.1649186611175537,0.06570291519165039,0.16804909706115723,0.06648492813110352,0.16637754440307617,0.16563081741333008,0.16990900039672852,0.2447509765625,0.27097415924072266,2.9366419315338135,0.9956948757171631,0.1658327579498291,0.1690964698791504,0.1652822494506836,0.1659691333770752,0.06614041328430176 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 cc8ba9ea24..72b640de31 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -106,refs/remotes/origin/pull/185,53e9d401e409ac8f9b99d475acb008450857b31f,d01281f86b40190d142afd8f62d839eabfd12111,3141f3a9bb4d8ff5402fcf055ed6f0cbe5fc9c66,,True,True,Tests_passed,77e7f5afd859171ad6b9c66c640c6167652fe127ea9ce3a63c5c3474142fc1bc,True,74,94,2828,5,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,True,74,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,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,a8f6548887246aa072b1417169b4185d9525f0a33b3d79f8937adcd2fa679fd0,Merge_timedout,,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,0.0698404312133789,0.06516599655151367,0.06358194351196289,0.024040937423706055,0.02820563316345215,0.0569002628326416,0.06377005577087402,0.38855695724487305,0.29111695289611816,2.0749354362487793,-1.0,0.046629905700683594,0.12852787971496582,0.04613685607910156,0.12724041938781738,0.12607717514038086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +106,refs/remotes/origin/pull/185,53e9d401e409ac8f9b99d475acb008450857b31f,d01281f86b40190d142afd8f62d839eabfd12111,3141f3a9bb4d8ff5402fcf055ed6f0cbe5fc9c66,,True,True,Tests_passed,77e7f5afd859171ad6b9c66c640c6167652fe127ea9ce3a63c5c3474142fc1bc,True,74,94,2828,5,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,True,74,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,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,a8f6548887246aa072b1417169b4185d9525f0a33b3d79f8937adcd2fa679fd0,Merge_timedout,,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,Tests_passed,ca840a9ec4de201b41669f86c7d4c10f9cbdb3472d382c775729cc83adc57bdb,0.0698404312133789,0.06516599655151367,0.06358194351196289,0.024040937423706055,0.02820563316345215,0.0569002628326416,0.06377005577087402,0.38855695724487305,0.29111695289611816,2.0749354362487793,-1.0,0.046629905700683594,0.12852787971496582,0.04613685607910156,0.12724041938781738,0.12607717514038086,0.1284644603729248,0.12941956520080566,0.1322307586669922,0.13176226615905762,0.13056302070617676,0.13001084327697754,0.13102126121520996,0.2220621109008789,0.23739147186279297,2.4433019161224365,-1.0,0.12978768348693848,0.13242173194885254,0.12998700141906738,0.12966156005859375,0.12857341766357422 diff --git a/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv b/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv index e49964d8bf..8a4d811b4c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,True,7,20,39,2,True,7,Tests_passed,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,True,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,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,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,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,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,c01f66a87e32c529f77e49790be60355cb12e242b642060aa2a8238a3cd1de08,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,0.04567670822143555,0.044271230697631836,0.04662370681762695,0.015871763229370117,0.04420590400695801,0.051384687423706055,0.051363229751586914,0.1692967414855957,0.12308073043823242,0.6090657711029053,0.33091139793395996,0.03290581703186035,0.05615878105163574,0.032675743103027344,0.056740522384643555,0.05575442314147949 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,True,7,20,39,2,True,7,Tests_passed,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,True,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,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,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,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,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,c01f66a87e32c529f77e49790be60355cb12e242b642060aa2a8238a3cd1de08,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,0.04567670822143555,0.044271230697631836,0.04662370681762695,0.015871763229370117,0.04420590400695801,0.051384687423706055,0.051363229751586914,0.1692967414855957,0.12308073043823242,0.6090657711029053,0.33091139793395996,0.03290581703186035,0.05615878105163574,0.032675743103027344,0.056740522384643555,0.05575442314147949,0.05314970016479492,0.054808616638183594,0.055367231369018555,0.05508255958557129,0.05647611618041992,0.055930376052856445,0.05463886260986328,0.08719348907470703,0.08438801765441895,0.6315329074859619,0.35340023040771484,0.054739952087402344,0.05447888374328613,0.055780649185180664,0.053594350814819336,0.05260491371154785 diff --git a/results/combined/merges_timed/mtedone/podam.csv b/results/combined/merges_timed/mtedone/podam.csv index b195cefdfc..a0bce005e3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -84,refs/heads/develop,58364a4c12addbed1a1ccc5415e07aadbe49012a,006dbd635f0eb2dbb1318e9d895fdaaf282f548d,d51460bf0a0b1bdee87973c01cf2241f508c7cfc,,True,True,True,10,22,632,5,True,17,Tests_passed,5395de2cea89ae1148b3a16f7db53f14e9e76551374b03809c3c2775e5127f80,True,Tests_passed,2798891134cb3857ed16c7ba9a2483ad766ad96da62711861250013b2a87ec5f,True,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,9a359973e1c4c8c3fdecf6b13250b6061b2df18dda69e838c8f62321c588c159,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,ef6ada9551489c5a996211a3b40aa0a1046ffc57ab2199e742c0c8c8c6360ea6,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,27d120303f1f564e80a22d376b1ba6ce0a035cc844c1d1de317ffb5ace594e93,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,0.04536604881286621,0.03962397575378418,0.04255843162536621,0.04066109657287598,0.04938769340515137,0.026918888092041016,0.024749755859375,0.18945956230163574,0.11489152908325195,0.4544212818145752,3.0719423294067383,0.0663762092590332,0.06597566604614258,0.0670778751373291,0.05793571472167969,0.06001710891723633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +84,refs/heads/develop,58364a4c12addbed1a1ccc5415e07aadbe49012a,006dbd635f0eb2dbb1318e9d895fdaaf282f548d,d51460bf0a0b1bdee87973c01cf2241f508c7cfc,,True,True,True,10,22,632,5,True,17,Tests_passed,5395de2cea89ae1148b3a16f7db53f14e9e76551374b03809c3c2775e5127f80,True,Tests_passed,2798891134cb3857ed16c7ba9a2483ad766ad96da62711861250013b2a87ec5f,True,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,9a359973e1c4c8c3fdecf6b13250b6061b2df18dda69e838c8f62321c588c159,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,ef6ada9551489c5a996211a3b40aa0a1046ffc57ab2199e742c0c8c8c6360ea6,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,27d120303f1f564e80a22d376b1ba6ce0a035cc844c1d1de317ffb5ace594e93,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,0.04536604881286621,0.03962397575378418,0.04255843162536621,0.04066109657287598,0.04938769340515137,0.026918888092041016,0.024749755859375,0.18945956230163574,0.11489152908325195,0.4544212818145752,3.0719423294067383,0.0663762092590332,0.06597566604614258,0.0670778751373291,0.05793571472167969,0.06001710891723633,0.06134295463562012,0.05868363380432129,0.0634913444519043,0.05977272987365723,0.06180906295776367,0.03481149673461914,0.06302499771118164,0.09885668754577637,0.09859514236450195,0.4773542881011963,3.14913010597229,0.06279349327087402,0.06050515174865723,0.058193206787109375,0.054137468338012695,0.03499174118041992 diff --git a/results/combined/merges_timed/mttkay/signpost.csv b/results/combined/merges_timed/mttkay/signpost.csv index aaa428b40a..9eddaf6808 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,True,17,51,381,6,True,17,Tests_passed,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,True,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,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,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,820a597c047dc84e20ec32dd442583b32f3a4bfefd11cdc2e1f7511bff6f9030,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,9b464ca38c28f36bc4599e0ee64f4e18c831d261e580bd0d2a352f7fce5fdd1e,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,0.04544353485107422,0.043966054916381836,0.046237945556640625,0.017534732818603516,0.03739428520202637,0.04694652557373047,0.04892253875732422,0.38678789138793945,0.34802770614624023,0.7837331295013428,0.5008981227874756,0.07705402374267578,0.09826493263244629,0.0787649154663086,0.09969449043273926,0.09843206405639648 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,True,17,51,381,6,True,17,Tests_passed,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,True,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,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,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,820a597c047dc84e20ec32dd442583b32f3a4bfefd11cdc2e1f7511bff6f9030,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,9b464ca38c28f36bc4599e0ee64f4e18c831d261e580bd0d2a352f7fce5fdd1e,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,0.04544353485107422,0.043966054916381836,0.046237945556640625,0.017534732818603516,0.03739428520202637,0.04694652557373047,0.04892253875732422,0.38678789138793945,0.34802770614624023,0.7837331295013428,0.5008981227874756,0.07705402374267578,0.09826493263244629,0.0787649154663086,0.09969449043273926,0.09843206405639648,0.09500837326049805,0.09395980834960938,0.09632229804992676,0.09603309631347656,0.09515738487243652,0.09704303741455078,0.09666991233825684,0.19076299667358398,0.23730993270874023,0.8612124919891357,0.6051087379455566,0.0977935791015625,0.09636545181274414,0.09678173065185547,0.09783005714416504,0.09628701210021973 diff --git a/results/combined/merges_timed/mwanji/toml4j.csv b/results/combined/merges_timed/mwanji/toml4j.csv index 9b67772aa4..76062c2988 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,True,27,59,1234,3,True,27,Tests_passed,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,True,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,True,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,2c017bcc7eb08fd78fec779fcd957f1eb7465812698d1f78c2bdafee0a8b11f8,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,e1ce7e22e9159d2a3c418042588c6214a1578165dbe8c67e105b091b72bf6971,Merge_failed,1554d848b9e6102d5290422ab29d1f7f0afcce02c9010c1c3744a8643f869055,Merge_failed,9e40a03fe6ab2f020e734363f0f0753f4bf510f3869cf30b38dd8ace3a487803,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,0.04077887535095215,0.04664325714111328,0.04082942008972168,0.019488811492919922,0.034862518310546875,0.045696258544921875,0.0393366813659668,0.22713828086853027,0.168900728225708,0.8746564388275146,0.3396124839782715,0.05550074577331543,0.07016468048095703,0.057160139083862305,0.0731041431427002,0.07293272018432617 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,True,27,59,1234,3,True,27,Tests_passed,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,True,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,True,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,2c017bcc7eb08fd78fec779fcd957f1eb7465812698d1f78c2bdafee0a8b11f8,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,e1ce7e22e9159d2a3c418042588c6214a1578165dbe8c67e105b091b72bf6971,Merge_failed,1554d848b9e6102d5290422ab29d1f7f0afcce02c9010c1c3744a8643f869055,Merge_failed,9e40a03fe6ab2f020e734363f0f0753f4bf510f3869cf30b38dd8ace3a487803,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,bdb1cd32fd4accc756b361bc69d1b73967fd568eb57ac945724b7bc25b7468d6,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,0.04077887535095215,0.04664325714111328,0.04082942008972168,0.019488811492919922,0.034862518310546875,0.045696258544921875,0.0393366813659668,0.22713828086853027,0.168900728225708,0.8746564388275146,0.3396124839782715,0.05550074577331543,0.07016468048095703,0.057160139083862305,0.0731041431427002,0.07293272018432617,0.06898808479309082,0.06911015510559082,0.07215619087219238,0.07031583786010742,0.07153964042663574,0.07181191444396973,0.0674595832824707,0.11634993553161621,0.12773656845092773,0.9422507286071777,0.4201958179473877,0.07172203063964844,0.0732119083404541,0.07067131996154785,0.06908416748046875,0.06853055953979492 diff --git a/results/combined/merges_timed/mybatis/jpetstore-6.csv b/results/combined/merges_timed/mybatis/jpetstore-6.csv index b9949fc7f2..f9051c7aca 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,True,16,42,323,3,True,16,Tests_passed,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,True,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,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,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09db42f1433902407af5f249a1fdec1651b5320db5bf70cd5a4dc29417a661d0,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,0.0409848690032959,0.023320913314819336,0.04799818992614746,0.03303194046020508,0.0418245792388916,0.038591861724853516,0.0467681884765625,0.22784948348999023,0.1524183750152588,0.04544329643249512,0.4148712158203125,0.0754086971282959,0.05649280548095703,0.08013725280761719,0.07772493362426758,0.05692148208618164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,True,16,42,323,3,True,16,Tests_passed,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,True,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,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,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09db42f1433902407af5f249a1fdec1651b5320db5bf70cd5a4dc29417a661d0,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,0.0409848690032959,0.023320913314819336,0.04799818992614746,0.03303194046020508,0.0418245792388916,0.038591861724853516,0.0467681884765625,0.22784948348999023,0.1524183750152588,0.04544329643249512,0.4148712158203125,0.0754086971282959,0.05649280548095703,0.08013725280761719,0.07772493362426758,0.05692148208618164,0.0704658031463623,0.05489397048950195,0.07480072975158691,0.07779145240783691,0.06158304214477539,0.07494115829467773,0.05489683151245117,0.128218412399292,0.139723539352417,0.09523534774780273,0.4692211151123047,0.07571625709533691,0.07509994506835938,0.05661725997924805,0.06960582733154297,0.07230687141418457 diff --git a/results/combined/merges_timed/mybatis/mybatis-3.csv b/results/combined/merges_timed/mybatis/mybatis-3.csv index 5ffb7a2090..7d5b5ed06c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,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_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,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,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.27336740493774414,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.19056057929992676,0.14876532554626465,17.35877227783203,0.3446626663208008,0.4415469169616699,0.33461546897888184,0.4390370845794678,0.430417537689209 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,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_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,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,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.27336740493774414,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.19056057929992676,0.14876532554626465,17.35877227783203,0.3446626663208008,0.4415469169616699,0.33461546897888184,0.4390370845794678,0.430417537689209,0.43198347091674805,0.31029820442199707,0.5608294010162354,0.3762390613555908,0.526869535446167,0.38623881340026855,0.5052497386932373,0.29189085960388184,0.3632626533508301,0.48984313011169434,15.550827741622925,0.2870762348175049,0.2750680446624756,0.2781178951263428,0.24372220039367676,0.24248576164245605 diff --git a/results/combined/merges_timed/mybatis/spring.csv b/results/combined/merges_timed/mybatis/spring.csv index 6a54783be6..68e77a3a16 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,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,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,Merge_timedout,,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05133366584777832,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.15196585655212402,0.05642056465148926,-1.0,0.08442568778991699,0.13748812675476074,0.08153247833251953,0.13863515853881836,0.1427145004272461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,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,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,Merge_timedout,,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05133366584777832,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.15196585655212402,0.05642056465148926,-1.0,0.08442568778991699,0.13748812675476074,0.08153247833251953,0.13863515853881836,0.1427145004272461,0.1317760944366455,0.13869094848632812,0.1439814567565918,0.14995193481445312,0.14048433303833008,0.144486665725708,0.1437239646911621,0.21114850044250488,0.19031214714050293,0.1575937271118164,-1.0,0.13879060745239258,0.12936115264892578,0.12840008735656738,0.13584089279174805,0.1279163360595703 diff --git a/results/combined/merges_timed/mycila/license-maven-plugin.csv b/results/combined/merges_timed/mycila/license-maven-plugin.csv index bad75ce2fb..2fbc41a3ce 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -173,refs/remotes/origin/pull/197,756e4d52b940fb8911942ebc2e5654e7cefe1597,39991e5512483613ab0c8d5cf2c21bde1f52ad5d,a6e528cee7fe56b9f310c77bc00eee0850ad0c36,,True,True,True,45,50,153,10,True,53,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,True,Tests_passed,53d0802c8bed7db42a799bd948cf65a2654a2618a48bd3bc8a028c3d1473618c,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,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_failed,866f769911dbf5d8bb2bd90d2e1a3b241d1811b211f74037c1c8b912f35dd6fa,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,0.06648063659667969,0.028137683868408203,0.02762293815612793,0.03735947608947754,0.03677940368652344,0.027880191802978516,0.025053739547729492,0.10411477088928223,0.07923579216003418,0.033995866775512695,0.6582760810852051,0.05089712142944336,0.07843327522277832,0.07320070266723633,0.09866786003112793,0.10106253623962402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +173,refs/remotes/origin/pull/197,756e4d52b940fb8911942ebc2e5654e7cefe1597,39991e5512483613ab0c8d5cf2c21bde1f52ad5d,a6e528cee7fe56b9f310c77bc00eee0850ad0c36,,True,True,True,45,50,153,10,True,53,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,True,Tests_passed,53d0802c8bed7db42a799bd948cf65a2654a2618a48bd3bc8a028c3d1473618c,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,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_failed,866f769911dbf5d8bb2bd90d2e1a3b241d1811b211f74037c1c8b912f35dd6fa,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,0.06648063659667969,0.028137683868408203,0.02762293815612793,0.03735947608947754,0.03677940368652344,0.027880191802978516,0.025053739547729492,0.10411477088928223,0.07923579216003418,0.033995866775512695,0.6582760810852051,0.05089712142944336,0.07843327522277832,0.07320070266723633,0.09866786003112793,0.10106253623962402,0.09703373908996582,0.07523369789123535,0.08668851852416992,0.10113406181335449,0.10088062286376953,0.07652974128723145,0.07695865631103516,0.14029693603515625,0.13574600219726562,0.11654877662658691,0.7074823379516602,0.07460904121398926,0.09409236907958984,0.09200239181518555,0.07084250450134277,0.07459354400634766 diff --git a/results/combined/merges_timed/mygrid/rightfield.csv b/results/combined/merges_timed/mygrid/rightfield.csv index a39209f5f3..a72b8c1c52 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,True,13,23,130,17,True,28,Tests_passed,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,True,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,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,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,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,88d90b295397235c7db440eff0926d361c43d38aab0515cb9a2f4b86a1649e15,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,0.03649735450744629,0.0400083065032959,0.017648935317993164,0.07728004455566406,0.04796934127807617,0.042380332946777344,0.029506206512451172,0.15703296661376953,0.09833168983459473,0.7682085037231445,0.7031228542327881,0.11458659172058105,0.13837957382202148,0.11290645599365234,0.13972902297973633,0.12853717803955078 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,True,13,23,130,17,True,28,Tests_passed,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,True,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,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,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,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,88d90b295397235c7db440eff0926d361c43d38aab0515cb9a2f4b86a1649e15,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,0.03649735450744629,0.0400083065032959,0.017648935317993164,0.07728004455566406,0.04796934127807617,0.042380332946777344,0.029506206512451172,0.15703296661376953,0.09833168983459473,0.7682085037231445,0.7031228542327881,0.11458659172058105,0.13837957382202148,0.11290645599365234,0.13972902297973633,0.12853717803955078,0.10310912132263184,0.13612890243530273,0.1554703712463379,0.12789225578308105,0.1414015293121338,0.13005733489990234,0.1288454532623291,0.15781259536743164,0.19110822677612305,0.8856046199798584,0.7717807292938232,0.10930275917053223,0.11339735984802246,0.13239836692810059,0.13622307777404785,0.13228416442871094 diff --git a/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv b/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv index 95d59dd4b7..df003e6ae1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,True,29,135,1610,7,True,29,Tests_passed,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,True,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,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,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,Merge_failed,3b3c3dc4f6fcc96a96257f3d65ac6991696ad4ea56f2ce9cd2d620c164f7d90e,Merge_failed,cd8b62333580a42aaf6d66213f6787cf4e6e28f4be97d23ab2fb5b40c6b9ffab,Merge_failed,04dfb5032e569b6abbc55d74a8e36ad01f8075d8f771a119c208001e062413a4,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,998930882d821aac889f43be7d64790d653912b3158faaf9525959d50e5fda31,Merge_failed,042082c85cd9c30716d00b5736cd97f3597c4f6895b3a5f0a803c0bed208f154,Merge_failed,349b738e76f4127c515617ef83ca8029e029d63231f6679757be3917d615a3bd,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,0.016804933547973633,0.01663351058959961,0.017778396606445312,0.02575206756591797,0.018414020538330078,0.017870664596557617,0.017925739288330078,0.10605192184448242,0.35230207443237305,3.6707022190093994,0.5802688598632812,0.10551214218139648,0.11906957626342773,0.10883855819702148,0.14054560661315918,0.1457228660583496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,True,29,135,1610,7,True,29,Tests_passed,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,True,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,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,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,Merge_failed,3b3c3dc4f6fcc96a96257f3d65ac6991696ad4ea56f2ce9cd2d620c164f7d90e,Merge_failed,cd8b62333580a42aaf6d66213f6787cf4e6e28f4be97d23ab2fb5b40c6b9ffab,Merge_failed,04dfb5032e569b6abbc55d74a8e36ad01f8075d8f771a119c208001e062413a4,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,998930882d821aac889f43be7d64790d653912b3158faaf9525959d50e5fda31,Merge_failed,042082c85cd9c30716d00b5736cd97f3597c4f6895b3a5f0a803c0bed208f154,Merge_failed,349b738e76f4127c515617ef83ca8029e029d63231f6679757be3917d615a3bd,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,9bedfe8b58fda119deef71b68817e6fea755af985d38cef205fbe7bb2b84256b,Merge_failed,00ff1399a6697165835f9a6312ba288d85e53271adc7f380b1ba90a2ad778ad2,0.016804933547973633,0.01663351058959961,0.017778396606445312,0.02575206756591797,0.018414020538330078,0.017870664596557617,0.017925739288330078,0.10605192184448242,0.35230207443237305,3.6707022190093994,0.5802688598632812,0.10551214218139648,0.11906957626342773,0.10883855819702148,0.14054560661315918,0.1457228660583496,0.1425611972808838,0.14400434494018555,0.14245867729187012,0.14770960807800293,0.1418743133544922,0.1416184902191162,0.14267373085021973,0.26203274726867676,0.3390049934387207,4.465837717056274,0.7478325366973877,0.13797879219055176,0.1436314582824707,0.14064335823059082,0.14207100868225098,0.14249038696289062 diff --git a/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv b/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv index 25c9affd10..3e1c4ad163 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,False,True,4,6,17,2,True,4,Tests_passed,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,True,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,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,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,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,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,4e1ccc837a8c506f0716905168d1afe9eacbd15ad7fe3a464001d60761b4d2b0,Tests_failed,930ec0b28696ef2699b785a539829ae081692611ffa2d70536ac9faae240cefb,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,0.036630868911743164,0.04319190979003906,0.045736074447631836,0.021725893020629883,0.04138493537902832,0.03898024559020996,0.03660988807678223,0.14175701141357422,0.10963249206542969,0.5799272060394287,0.29059720039367676,0.032312631607055664,0.06670498847961426,0.04416847229003906,0.05640125274658203,0.0684041976928711 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,False,True,4,6,17,2,True,4,Tests_passed,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,True,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,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,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,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,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,4e1ccc837a8c506f0716905168d1afe9eacbd15ad7fe3a464001d60761b4d2b0,Tests_failed,930ec0b28696ef2699b785a539829ae081692611ffa2d70536ac9faae240cefb,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,0.036630868911743164,0.04319190979003906,0.045736074447631836,0.021725893020629883,0.04138493537902832,0.03898024559020996,0.03660988807678223,0.14175701141357422,0.10963249206542969,0.5799272060394287,0.29059720039367676,0.032312631607055664,0.06670498847961426,0.04416847229003906,0.05640125274658203,0.0684041976928711,0.06252288818359375,0.054239511489868164,0.06686520576477051,0.06782841682434082,0.05494403839111328,0.06716203689575195,0.06625223159790039,0.08717727661132812,0.09816861152648926,0.5994586944580078,0.3433802127838135,0.0642080307006836,0.0620121955871582,0.06536531448364258,0.05430889129638672,0.06416511535644531 diff --git a/results/combined/merges_timed/nabedge/mixer2.csv b/results/combined/merges_timed/nabedge/mixer2.csv index 6dc6b6d64b..7bfd768ca6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,True,148,173,533732,2,True,148,Tests_passed,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,True,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,True,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,86156d1ad2d3f050bd1118f67f70482b80616ccf14a4cc914fd7505128eacf94,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Tests_failed,20e0a272527a12f4b8f842187158c2729ee88facc95145a6700bbaae8cd68aff,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,8416c406af3e4380ec6865a0485b69c90a081e3d720b97ffab9c68cb82ad8318,Tests_failed,bbb6f02b017bb4b6ebade36e4922ef6f44bb73a1c39069b39ffba2e958c0d1c3,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,0.0118408203125,0.012058019638061523,0.012236595153808594,0.04201054573059082,0.011817216873168945,0.012737751007080078,0.012202739715576172,0.04940462112426758,0.07339310646057129,0.8504440784454346,0.3625528812408447,0.047544002532958984,0.06307864189147949,0.08330416679382324,0.11216425895690918,0.06298279762268066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,True,148,173,533732,2,True,148,Tests_passed,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,True,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,True,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,86156d1ad2d3f050bd1118f67f70482b80616ccf14a4cc914fd7505128eacf94,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Tests_failed,20e0a272527a12f4b8f842187158c2729ee88facc95145a6700bbaae8cd68aff,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,8416c406af3e4380ec6865a0485b69c90a081e3d720b97ffab9c68cb82ad8318,Tests_failed,bbb6f02b017bb4b6ebade36e4922ef6f44bb73a1c39069b39ffba2e958c0d1c3,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,165213cb853314d4340d325696b8ca469e3d6213ead295e99eb81b4341bbf8be,Tests_passed,92a1798724b9b163d8f3ee0cac54f49aaa4e08bcefc2dd74094a6ae9601254dd,0.0118408203125,0.012058019638061523,0.012236595153808594,0.04201054573059082,0.011817216873168945,0.012737751007080078,0.012202739715576172,0.04940462112426758,0.07339310646057129,0.8504440784454346,0.3625528812408447,0.047544002532958984,0.06307864189147949,0.08330416679382324,0.11216425895690918,0.06298279762268066,0.06025862693786621,0.09323954582214355,0.11108064651489258,0.06376767158508301,0.06417965888977051,0.09819269180297852,0.1093897819519043,0.091827392578125,0.09598946571350098,0.8992800712585449,0.43699073791503906,0.06238961219787598,0.10930228233337402,0.10946965217590332,0.06153750419616699,0.06170511245727539 diff --git a/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv b/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv index 332ecb6cea..0ded904fb5 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,Tests_passed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,True,4,91,930,11,True,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,True,11,True,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,0.016828298568725586,0.01681065559387207,0.018436908721923828,0.023830652236938477,0.016943693161010742,0.01726555824279785,0.01728081703186035,0.07274246215820312,0.18922805786132812,1.7167747020721436,0.36734437942504883,0.05337095260620117,0.052498579025268555,0.054076433181762695,0.0538787841796875,0.052555084228515625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,Tests_passed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,True,4,91,930,11,True,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,True,11,True,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,0.016828298568725586,0.01681065559387207,0.018436908721923828,0.023830652236938477,0.016943693161010742,0.01726555824279785,0.01728081703186035,0.07274246215820312,0.18922805786132812,1.7167747020721436,0.36734437942504883,0.05337095260620117,0.052498579025268555,0.054076433181762695,0.0538787841796875,0.052555084228515625,0.05419445037841797,0.052056074142456055,0.05380964279174805,0.05261683464050293,0.05394148826599121,0.052683115005493164,0.05521130561828613,0.11992287635803223,0.14137554168701172,1.6651387214660645,0.443087100982666,0.055532217025756836,0.05294013023376465,0.05311989784240723,0.05158495903015137,0.05259823799133301 diff --git a/results/combined/merges_timed/named-data/jndn.csv b/results/combined/merges_timed/named-data/jndn.csv index 7cb3df6bf9..a7bfa7463a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -100,refs/heads/master,62f89871b57a8bc206428dacff6bde4e6fd305c3,318bd51335506f9a12790dfb69b85fec27ff4152,796ba6f83f0440eeacc27fb47ac57f1423a7c5a1,,True,True,Tests_passed,dfe712b9849913b23258387bdbbdf0edfa57f2ad61e282f5acf102c43e230518,True,12,114,616,2,True,Tests_passed,149e60c28d446efb0d8b557368e599a3895c40482931ca0543ce350ac96f4f57,True,12,True,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,f745ec18d5b5faabba378f9831bb65c26bb7d3c8b45073cb53a04bb3ba190236,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,6952cf7c9ed88275b0b5b165ec340d3ebcdac7a6b4a72a555d1b9be583f62461,Tests_failed,2a6a15b24fe27b723263ee3371628672b3cf2be5fcc494f8b729d9bf05f21e30,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,0.0163266658782959,0.058823347091674805,0.0834050178527832,0.09038853645324707,0.0260622501373291,0.0827627182006836,0.08559918403625488,0.14271879196166992,0.13721203804016113,1.824767827987671,0.8572084903717041,0.061972856521606445,0.09590983390808105,0.14494085311889648,0.1782677173614502,0.07443046569824219 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +100,refs/heads/master,62f89871b57a8bc206428dacff6bde4e6fd305c3,318bd51335506f9a12790dfb69b85fec27ff4152,796ba6f83f0440eeacc27fb47ac57f1423a7c5a1,,True,True,Tests_passed,dfe712b9849913b23258387bdbbdf0edfa57f2ad61e282f5acf102c43e230518,True,12,114,616,2,True,Tests_passed,149e60c28d446efb0d8b557368e599a3895c40482931ca0543ce350ac96f4f57,True,12,True,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,f745ec18d5b5faabba378f9831bb65c26bb7d3c8b45073cb53a04bb3ba190236,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,6952cf7c9ed88275b0b5b165ec340d3ebcdac7a6b4a72a555d1b9be583f62461,Tests_failed,2a6a15b24fe27b723263ee3371628672b3cf2be5fcc494f8b729d9bf05f21e30,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,0.0163266658782959,0.058823347091674805,0.0834050178527832,0.09038853645324707,0.0260622501373291,0.0827627182006836,0.08559918403625488,0.14271879196166992,0.13721203804016113,1.824767827987671,0.8572084903717041,0.061972856521606445,0.09590983390808105,0.14494085311889648,0.1782677173614502,0.07443046569824219,0.13541460037231445,0.07388019561767578,0.20076656341552734,0.07346320152282715,0.19553351402282715,0.20598077774047852,0.11426281929016113,0.26209235191345215,0.10805130004882812,2.1901683807373047,0.9411563873291016,0.16820478439331055,0.0720820426940918,0.17066645622253418,0.1813642978668213,0.06990528106689453 diff --git a/results/combined/merges_timed/nanohttpd/nanohttpd.csv b/results/combined/merges_timed/nanohttpd/nanohttpd.csv index 8f8d9aa069..80a23f0797 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -63,refs/heads/master,60b7e9249246749a16bf8bc29aa117e4201eae8b,9f38ca21e99986290bf65a8fec17d2592d98d744,f3b51b6d9e8b24f2f2e021465b0f5972ad12892d,,True,True,Tests_passed,87b6eab2757739ab17836dd16e1ff7a1fd446cadd5f0d20f465d3ef35a1eef88,True,37,85,2192,7,True,Tests_passed,99696991e38a87f16c5765f471b83689f42a5162b27fd9d76adad8326cbbf526,True,37,True,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,ba398f1fb8807bb5ad68610a18fe4e55a5bad223cb6b85a225fe9955ef5c0377,Tests_failed,f9dbe05a44ea7bc625bd690091487dd9cceb9a8e528e92747582d6c7610309a1,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,3e009e44ab951a3d0d0fd7e6481fd1c1a630ff72b40661cb25cbf2dd1b5d5e72,Tests_failed,f9dbe05a44ea7bc625bd690091487dd9cceb9a8e528e92747582d6c7610309a1,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,0.022409677505493164,0.021352767944335938,0.025658130645751953,0.027663469314575195,0.02237248420715332,0.02210402488708496,0.021994590759277344,0.14631056785583496,0.4307694435119629,2.793992280960083,0.9518370628356934,0.04692840576171875,0.17158722877502441,0.046553611755371094,0.17550086975097656,0.1769120693206787 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +63,refs/heads/master,60b7e9249246749a16bf8bc29aa117e4201eae8b,9f38ca21e99986290bf65a8fec17d2592d98d744,f3b51b6d9e8b24f2f2e021465b0f5972ad12892d,,True,True,Tests_passed,87b6eab2757739ab17836dd16e1ff7a1fd446cadd5f0d20f465d3ef35a1eef88,True,37,85,2192,7,True,Tests_passed,99696991e38a87f16c5765f471b83689f42a5162b27fd9d76adad8326cbbf526,True,37,True,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,ba398f1fb8807bb5ad68610a18fe4e55a5bad223cb6b85a225fe9955ef5c0377,Tests_failed,f9dbe05a44ea7bc625bd690091487dd9cceb9a8e528e92747582d6c7610309a1,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,3e009e44ab951a3d0d0fd7e6481fd1c1a630ff72b40661cb25cbf2dd1b5d5e72,Tests_failed,f9dbe05a44ea7bc625bd690091487dd9cceb9a8e528e92747582d6c7610309a1,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,0.022409677505493164,0.021352767944335938,0.025658130645751953,0.027663469314575195,0.02237248420715332,0.02210402488708496,0.021994590759277344,0.14631056785583496,0.4307694435119629,2.793992280960083,0.9518370628356934,0.04692840576171875,0.17158722877502441,0.046553611755371094,0.17550086975097656,0.1769120693206787,0.16808104515075684,0.16920804977416992,0.16603636741638184,0.16707801818847656,0.17065858840942383,0.16940999031066895,0.16922950744628906,0.279386043548584,0.30834102630615234,3.0898354053497314,0.9548099040985107,0.1663370132446289,0.16872668266296387,0.16654658317565918,0.1669323444366455,0.16639971733093262 diff --git a/results/combined/merges_timed/nastel/tnt4j.csv b/results/combined/merges_timed/nastel/tnt4j.csv index 8647874397..68c8b0acaa 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,True,True,True,13,52,307,14,True,19,Tests_passed,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,True,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,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,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,b84b99964f5bca296281597c951cc6587e48d39637fd809f05f7478840e01137,Tests_passed,48182e65232f4b3aa6a4f98229e8a13351dc9017774ee28e25f185a0c3747634,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,0a49754c0af4ddc33e8c89e954d0c83fab8a9c315f56e76476f07eda0a3447dd,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,0.03827500343322754,0.03664875030517578,0.029434919357299805,0.025052309036254883,0.024693012237548828,0.01836228370666504,0.04832005500793457,0.5296530723571777,0.46618151664733887,2.3889567852020264,0.7263278961181641,0.1054842472076416,0.143507719039917,0.13961005210876465,0.21198606491088867,0.18071436882019043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,True,True,True,13,52,307,14,True,19,Tests_passed,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,True,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,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,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,b84b99964f5bca296281597c951cc6587e48d39637fd809f05f7478840e01137,Tests_passed,48182e65232f4b3aa6a4f98229e8a13351dc9017774ee28e25f185a0c3747634,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,0a49754c0af4ddc33e8c89e954d0c83fab8a9c315f56e76476f07eda0a3447dd,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,Tests_passed,f0856b313225b26cb0007811dc85844c900d7f30e5171e2661949e9eae0278e8,0.03827500343322754,0.03664875030517578,0.029434919357299805,0.025052309036254883,0.024693012237548828,0.01836228370666504,0.04832005500793457,0.5296530723571777,0.46618151664733887,2.3889567852020264,0.7263278961181641,0.1054842472076416,0.143507719039917,0.13961005210876465,0.21198606491088867,0.18071436882019043,0.20896172523498535,0.20289301872253418,0.1819908618927002,0.2143404483795166,0.19303154945373535,0.18458986282348633,0.21708440780639648,0.3115053176879883,0.38338780403137207,2.876380205154419,0.9951863288879395,0.19845271110534668,0.18175864219665527,0.21014952659606934,0.18289923667907715,0.1793513298034668 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 b8ded81ce1..65e571401f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,True,8,32,530,4,True,8,Tests_passed,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,True,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,True,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,34f3e25d7a1721860a0be42da4fc9d0ee86e9693a479d161aac08dc03a9e479c,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,9c04828a083fa95f3d83d8fe259cf1be79438fc91819b9da6477a6e32c17ec21,Merge_failed,666cffaacb1f493adf07d2e326dc229b4ec05f4e87dddb0664b00ae4dae275ca,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,0.009414196014404297,0.010398387908935547,0.009886026382446289,0.016953468322753906,0.010094165802001953,0.010105609893798828,0.010064363479614258,0.05822896957397461,0.17987728118896484,0.013338088989257812,0.4115166664123535,0.05357766151428223,0.07798147201538086,0.05684232711791992,0.08788061141967773,0.08886098861694336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,True,8,32,530,4,True,8,Tests_passed,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,True,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,True,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,34f3e25d7a1721860a0be42da4fc9d0ee86e9693a479d161aac08dc03a9e479c,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,9c04828a083fa95f3d83d8fe259cf1be79438fc91819b9da6477a6e32c17ec21,Merge_failed,666cffaacb1f493adf07d2e326dc229b4ec05f4e87dddb0664b00ae4dae275ca,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,104e1192aaa59f18410f865ae9e5d81ac9fd84bab7d37aca7f33f5dffa4051e3,Merge_failed,07f68dd1d9602209918c3339942b515cfab5c1faee8e328dfea2fef9442e040a,0.009414196014404297,0.010398387908935547,0.009886026382446289,0.016953468322753906,0.010094165802001953,0.010105609893798828,0.010064363479614258,0.05822896957397461,0.17987728118896484,0.013338088989257812,0.4115166664123535,0.05357766151428223,0.07798147201538086,0.05684232711791992,0.08788061141967773,0.08886098861694336,0.08597469329833984,0.08740782737731934,0.08728218078613281,0.0866854190826416,0.08715271949768066,0.08911275863647461,0.08697342872619629,0.15230202674865723,0.18051743507385254,0.10207080841064453,0.5386483669281006,0.08748054504394531,0.08571672439575195,0.08820319175720215,0.08744668960571289,0.08707022666931152 diff --git a/results/combined/merges_timed/needle4j/needle4j.csv b/results/combined/merges_timed/needle4j/needle4j.csv index f14c981012..33cdc049e3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,True,True,Tests_passed,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,True,31,116,1541,4,True,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,True,31,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,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Tests_failed,1bf712f64938ccb4e00e2342c7557e74e5a4d81ba0a8e6034cc23c419510e935,Merge_failed,944a3b23897e886b3b9587214e7e2d9b3c8ab433689356a08ff81d14b6b3e9f3,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,2cf9fbd9d6a8acc331c76967fff1266f9a5cd6ad52c3a9d4494fa040fee1f5a0,Merge_failed,0c89c233c55b88d25502b25b7332bed097dae49671712cdf0b2b2a0f4fb4727e,Merge_failed,0c89c233c55b88d25502b25b7332bed097dae49671712cdf0b2b2a0f4fb4727e,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,6072ad1d49588713ff8b076d66dfc222c8f4b502e119f19f8d0b3032c581f0ee,Merge_failed,2a6487cd3ca6a7db9aaed48557eff2b14c2e0f9b5bf3378732151b0c97fec301,Tests_failed,9749de8d63ce5aeaba915e467711365593f12df69db6737ed83db864a766a7c3,Tests_failed,07db25ad2a06ef123caff56873eb90dfb54662a5989766edaba551b437ba8da9,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,0.05286741256713867,0.04703927040100098,0.022038936614990234,0.024038314819335938,0.04700660705566406,0.03243708610534668,0.032337188720703125,0.3109431266784668,0.25876545906066895,2.3697664737701416,0.7016875743865967,0.06702923774719238,0.09037661552429199,0.08586668968200684,0.11599302291870117,0.11089062690734863 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,True,True,Tests_passed,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,True,31,116,1541,4,True,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,True,31,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,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Tests_failed,1bf712f64938ccb4e00e2342c7557e74e5a4d81ba0a8e6034cc23c419510e935,Merge_failed,944a3b23897e886b3b9587214e7e2d9b3c8ab433689356a08ff81d14b6b3e9f3,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,2cf9fbd9d6a8acc331c76967fff1266f9a5cd6ad52c3a9d4494fa040fee1f5a0,Merge_failed,0c89c233c55b88d25502b25b7332bed097dae49671712cdf0b2b2a0f4fb4727e,Merge_failed,0c89c233c55b88d25502b25b7332bed097dae49671712cdf0b2b2a0f4fb4727e,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,6072ad1d49588713ff8b076d66dfc222c8f4b502e119f19f8d0b3032c581f0ee,Merge_failed,2a6487cd3ca6a7db9aaed48557eff2b14c2e0f9b5bf3378732151b0c97fec301,Tests_failed,9749de8d63ce5aeaba915e467711365593f12df69db6737ed83db864a766a7c3,Tests_failed,07db25ad2a06ef123caff56873eb90dfb54662a5989766edaba551b437ba8da9,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,1affb06122a6da4ae393cf88243c8dfaa1e83618c32f446f9ded4d9e3a639191,Merge_failed,c23d8edeb39a30753f707651a6a13aba41dc99a2c9cf271ed46a88a8b743c04c,0.05286741256713867,0.04703927040100098,0.022038936614990234,0.024038314819335938,0.04700660705566406,0.03243708610534668,0.032337188720703125,0.3109431266784668,0.25876545906066895,2.3697664737701416,0.7016875743865967,0.06702923774719238,0.09037661552429199,0.08586668968200684,0.11599302291870117,0.11089062690734863,0.11741971969604492,0.10257148742675781,0.1221761703491211,0.10414695739746094,0.0987706184387207,0.10450601577758789,0.12131285667419434,0.1597003936767578,0.21035289764404297,2.7440946102142334,0.9310574531555176,0.10906863212585449,0.12291336059570312,0.1121368408203125,0.11209511756896973,0.10944294929504395 diff --git a/results/combined/merges_timed/nepxion/discovery.csv b/results/combined/merges_timed/nepxion/discovery.csv index 393b504cfc..a63f92a732 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,True,9,64,377.0,3,True,9,Tests_passed,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,True,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,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,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Tests_failed,cd4a0ddb5320b575bf6d983d5ee5b1e69e24655376fee5113ba549cfe931ea5a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,367dc7a06d591367415e020ea300bd4ff1712eaff01932eb0ef6ab26e5e49f00,Merge_failed,0711f78ef0243ad0552d6629e3a9619745c32852c97b3f52ae0039a73a8e2586,Merge_failed,0711f78ef0243ad0552d6629e3a9619745c32852c97b3f52ae0039a73a8e2586,Merge_failed,dec09320709d0042eb846ada5528832632469c4645bccc8e6b6ad633a368aaa1,Merge_failed,62c00a0dec9b0f8ba1bb8b0a7e35b82a75769a790a2be32a97cb72341092d051,Merge_failed,368bd410e0a5437b836edd091031ecc7c62a79051201467d7469607161843f30,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Tests_failed,4d82af98ddc62c9f1f32f79d51497095c060d2d024130e7a4b413d19603e3ed4,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.020579814910888672,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.18300557136535645,0.03519845008850098,1.3279144763946533,0.049783945083618164,0.07014107704162598,0.050087928771972656,0.07156014442443848,0.07279682159423828 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,True,9,64,377.0,3,True,9,Tests_passed,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,True,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,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,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Tests_failed,cd4a0ddb5320b575bf6d983d5ee5b1e69e24655376fee5113ba549cfe931ea5a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,367dc7a06d591367415e020ea300bd4ff1712eaff01932eb0ef6ab26e5e49f00,Merge_failed,0711f78ef0243ad0552d6629e3a9619745c32852c97b3f52ae0039a73a8e2586,Merge_failed,0711f78ef0243ad0552d6629e3a9619745c32852c97b3f52ae0039a73a8e2586,Merge_failed,dec09320709d0042eb846ada5528832632469c4645bccc8e6b6ad633a368aaa1,Merge_failed,62c00a0dec9b0f8ba1bb8b0a7e35b82a75769a790a2be32a97cb72341092d051,Merge_failed,368bd410e0a5437b836edd091031ecc7c62a79051201467d7469607161843f30,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Tests_failed,4d82af98ddc62c9f1f32f79d51497095c060d2d024130e7a4b413d19603e3ed4,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,bfecd0b8993c03fb0483d414bf12c269eae21ef560cb39be9129f8c03fcaa75a,Merge_failed,969c257f38d567e1625b049d719561e2247e607046ceb3acf8d4a320e74640a5,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.020579814910888672,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.18300557136535645,0.03519845008850098,1.3279144763946533,0.049783945083618164,0.07014107704162598,0.050087928771972656,0.07156014442443848,0.07279682159423828,0.06854677200317383,0.0681006908416748,0.06957221031188965,0.0706326961517334,0.06883811950683594,0.07115030288696289,0.07065629959106445,0.12122106552124023,0.1314539909362793,0.08374834060668945,1.4090590476989746,0.06808257102966309,0.06922006607055664,0.06910037994384766,0.06985592842102051,0.06820392608642578 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 33af56577d..cbfd65c694 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,False,True,6,17,112,2,True,6,Tests_passed,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,True,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,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,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,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,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,5c21727490bd60aab4ff09a3793f4ddce3ae8a732f64a1b9cfcf3226f254d02d,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,0.044162750244140625,0.0438687801361084,0.039580345153808594,0.01603865623474121,0.05344510078430176,0.04492044448852539,0.036200523376464844,0.17362117767333984,0.11258077621459961,0.787304162979126,0.5721790790557861,0.0334627628326416,0.05822467803955078,0.033811330795288086,0.05897688865661621,0.05828857421875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,False,True,6,17,112,2,True,6,Tests_passed,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,True,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,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,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,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,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,5c21727490bd60aab4ff09a3793f4ddce3ae8a732f64a1b9cfcf3226f254d02d,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,0.044162750244140625,0.0438687801361084,0.039580345153808594,0.01603865623474121,0.05344510078430176,0.04492044448852539,0.036200523376464844,0.17362117767333984,0.11258077621459961,0.787304162979126,0.5721790790557861,0.0334627628326416,0.05822467803955078,0.033811330795288086,0.05897688865661621,0.05828857421875,0.05717110633850098,0.053961753845214844,0.05752253532409668,0.05749940872192383,0.05701899528503418,0.0579218864440918,0.0560297966003418,0.08943510055541992,0.08836984634399414,0.8065261840820312,0.6080584526062012,0.056908369064331055,0.05663704872131348,0.05660605430603027,0.0578615665435791,0.054312944412231445 diff --git a/results/combined/merges_timed/netflix/rxjava.csv b/results/combined/merges_timed/netflix/rxjava.csv index db24fb7528..4fb21e216d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,True,True,True,15,158,516,9,True,18,Tests_passed,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,True,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,True,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,451cc1e312fde5ead95caa2d55612fd1146ef9cd9f5ed8dbad9c131062d66bb8,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,afb79a494b0e532651fafa10a2fddfac239d5282751c92983729a6f32cbddb53,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,0.08119463920593262,0.0754086971282959,0.0734105110168457,0.07065224647521973,0.07433390617370605,0.10346055030822754,0.08720111846923828,0.5075204372406006,0.3640933036804199,0.09866189956665039,8.091000318527222,0.14392757415771484,0.14620280265808105,0.144087553024292,0.14417719841003418,0.14624571800231934 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,True,True,True,15,158,516,9,True,18,Tests_passed,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,True,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,True,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,451cc1e312fde5ead95caa2d55612fd1146ef9cd9f5ed8dbad9c131062d66bb8,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,afb79a494b0e532651fafa10a2fddfac239d5282751c92983729a6f32cbddb53,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,0.08119463920593262,0.0754086971282959,0.0734105110168457,0.07065224647521973,0.07433390617370605,0.10346055030822754,0.08720111846923828,0.5075204372406006,0.3640933036804199,0.09866189956665039,8.091000318527222,0.14392757415771484,0.14620280265808105,0.144087553024292,0.14417719841003418,0.14624571800231934,0.13300585746765137,0.13893604278564453,0.13780975341796875,0.1409893035888672,0.1432030200958252,0.13956928253173828,0.14008665084838867,0.25338315963745117,0.29374217987060547,0.16173958778381348,8.561274528503418,0.13501262664794922,0.13604402542114258,0.1393582820892334,0.13544082641601562,0.13626861572265625 diff --git a/results/combined/merges_timed/newbee-ltd/newbee-mall.csv b/results/combined/merges_timed/newbee-ltd/newbee-mall.csv index 6a27e786c9..9f2d4bf457 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,True,495,413,314313,5,True,495,Tests_passed,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,True,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,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,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,563b6bc35a0c8d89fdf856da81a37022547b707c7a583757ff678e645b90a430,Merge_failed,0d8803437fe8c170e960b0fbea62ea15b16b1d488cb98a430d881c4c5a7f33f2,Merge_failed,0d8803437fe8c170e960b0fbea62ea15b16b1d488cb98a430d881c4c5a7f33f2,Merge_failed,a241a84abd42ba4f45fe6a9f073404a647126bf9c83a701a4aaa114b9ae8ee2e,Merge_failed,17f71f0bcfe0d48cb63223c51ca88f8bb4a6fab670d1a5039a80ad1daa83a676,Merge_failed,623470ca504d8400cbec35c23b37a749228405b60070f5cb81068f7607779bfa,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_failed,81075e4f0d416eb057b6b7d90b39708319e70d54611346defb6f4693347f152a,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1556072235107422,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.3409719467163086,0.13479018211364746,0.8255622386932373,0.24730873107910156,0.3333718776702881,0.24251914024353027,0.35411787033081055,0.4249751567840576 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,True,495,413,314313,5,True,495,Tests_passed,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,True,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,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,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,563b6bc35a0c8d89fdf856da81a37022547b707c7a583757ff678e645b90a430,Merge_failed,0d8803437fe8c170e960b0fbea62ea15b16b1d488cb98a430d881c4c5a7f33f2,Merge_failed,0d8803437fe8c170e960b0fbea62ea15b16b1d488cb98a430d881c4c5a7f33f2,Merge_failed,a241a84abd42ba4f45fe6a9f073404a647126bf9c83a701a4aaa114b9ae8ee2e,Merge_failed,17f71f0bcfe0d48cb63223c51ca88f8bb4a6fab670d1a5039a80ad1daa83a676,Merge_failed,623470ca504d8400cbec35c23b37a749228405b60070f5cb81068f7607779bfa,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_failed,81075e4f0d416eb057b6b7d90b39708319e70d54611346defb6f4693347f152a,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Merge_failed,2a94afdcf132af13914b8a3f53d02ab1684fe76545d236ae668a973c21c03b7f,Tests_passed,34d6a8e200c804dd5235eec0972afc23b931d39136cd3d59fcc80aba2737e715,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1556072235107422,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.3409719467163086,0.13479018211364746,0.8255622386932373,0.24730873107910156,0.3333718776702881,0.24251914024353027,0.35411787033081055,0.4249751567840576,0.33637523651123047,0.43773841857910156,0.34877920150756836,0.46435070037841797,0.38890719413757324,0.3901498317718506,0.4045400619506836,0.5646464824676514,0.5246083736419678,0.356827974319458,0.891005277633667,0.33280110359191895,0.33555030822753906,0.3283679485321045,0.3279612064361572,0.4480867385864258 diff --git a/results/combined/merges_timed/nhl/link-etl.csv b/results/combined/merges_timed/nhl/link-etl.csv index 72c07c97b4..0cd3a33fa8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,True,113,566,4607,4,True,113,Tests_passed,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,True,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,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,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,34c30322a34defcc6d7f00cc85f817254f38248804ae3f5ca148a60b2aee8360,Merge_failed,34c30322a34defcc6d7f00cc85f817254f38248804ae3f5ca148a60b2aee8360,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,887d3e99464e2a25682b30d255cbcebddf859d0848ecffd9f47e72eb9782307b,Merge_failed,39462723ffb24f5d006e15efab9ad483aeb987741f4ff231613f809bd8760b50,Tests_failed,c3dd7adedf20044a5366ef293d02b2c167e1acd64855b70f3ff3a137b12b3191,Tests_failed,ca0fae9fd6cfc8e56ef6daddaa89f6948233faf0142ec219b2e5d625bc90144f,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,0.05789780616760254,0.059975385665893555,0.05385112762451172,0.030449867248535156,0.061199188232421875,0.06631803512573242,0.06209206581115723,0.2973804473876953,0.25168275833129883,1.5359086990356445,2.76947283744812,0.056250810623168945,0.10022783279418945,0.05488920211791992,0.09674406051635742,0.09267663955688477 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,True,113,566,4607,4,True,113,Tests_passed,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,True,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,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,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,Merge_failed,34c30322a34defcc6d7f00cc85f817254f38248804ae3f5ca148a60b2aee8360,Merge_failed,34c30322a34defcc6d7f00cc85f817254f38248804ae3f5ca148a60b2aee8360,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,887d3e99464e2a25682b30d255cbcebddf859d0848ecffd9f47e72eb9782307b,Merge_failed,39462723ffb24f5d006e15efab9ad483aeb987741f4ff231613f809bd8760b50,Tests_failed,c3dd7adedf20044a5366ef293d02b2c167e1acd64855b70f3ff3a137b12b3191,Tests_failed,ca0fae9fd6cfc8e56ef6daddaa89f6948233faf0142ec219b2e5d625bc90144f,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,060becb0ef69b3e0fd0dfb03538440280722cf6722e6918d18e21bec5b052465,Merge_failed,8fc742e6b46d98dfad890471766e215b1005f74fd883a067ba0c94603f8d5673,0.05789780616760254,0.059975385665893555,0.05385112762451172,0.030449867248535156,0.061199188232421875,0.06631803512573242,0.06209206581115723,0.2973804473876953,0.25168275833129883,1.5359086990356445,2.76947283744812,0.056250810623168945,0.10022783279418945,0.05488920211791992,0.09674406051635742,0.09267663955688477,0.09245944023132324,0.09276652336120605,0.0938560962677002,0.09416580200195312,0.09137511253356934,0.10428476333618164,0.10458612442016602,0.16826510429382324,0.17644882202148438,1.7426013946533203,2.978762626647949,0.09286642074584961,0.09194064140319824,0.09381461143493652,0.09235954284667969,0.09261298179626465 diff --git a/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv b/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv index d8bac13b32..fc02ad0e17 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,True,15,67,518,3,True,15,Tests_passed,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,True,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,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_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,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_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,2bcd280b1e03bb07232a70bb6d8f3907cb9fd3af03bf80aaeaa8198cd33f0b40,Merge_timedout,,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,0.01255345344543457,0.012227535247802734,0.014419794082641602,0.021947383880615234,0.013825178146362305,0.01383209228515625,0.01384115219116211,0.05324268341064453,0.11973714828491211,1.2554724216461182,-1.0,0.04156923294067383,0.08196687698364258,0.034128665924072266,0.08439993858337402,0.07643651962280273 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,True,15,67,518,3,True,15,Tests_passed,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,True,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,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_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,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_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,2bcd280b1e03bb07232a70bb6d8f3907cb9fd3af03bf80aaeaa8198cd33f0b40,Merge_timedout,,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,0.01255345344543457,0.012227535247802734,0.014419794082641602,0.021947383880615234,0.013825178146362305,0.01383209228515625,0.01384115219116211,0.05324268341064453,0.11973714828491211,1.2554724216461182,-1.0,0.04156923294067383,0.08196687698364258,0.034128665924072266,0.08439993858337402,0.07643651962280273,0.07929563522338867,0.08024430274963379,0.0815279483795166,0.08398127555847168,0.08322715759277344,0.08350157737731934,0.08251380920410156,0.13103103637695312,0.12932205200195312,1.3965423107147217,-1.0,0.08266615867614746,0.07588648796081543,0.07875609397888184,0.07467246055603027,0.07853937149047852 diff --git a/results/combined/merges_timed/ning/compress.csv b/results/combined/merges_timed/ning/compress.csv index 391f923532..3a42248a32 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,True,True,Tests_passed,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,True,25,122,807,3,True,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,True,25,True,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,b8463a6e5f0d2feab7f831b99a1c19c7765a19b0a50a269de1cd61269a581703,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Tests_failed,afa44658f1c8df749150363300e6869e52f756f62c54048cbd3a0322521b1e35,Merge_failed,ce2eb3f2e23daa9a39d8ce2dea35187ae400837c8089263446c1d7297230e8db,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_failed,ae6813ea45e834c07ef545312ff76a750de16faea1605770872179edd2598633,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,0.06889677047729492,0.07657957077026367,0.08522439002990723,0.11098933219909668,0.06861019134521484,0.08226394653320312,0.09406089782714844,0.1736316680908203,0.17258286476135254,1.2790298461914062,0.5993554592132568,0.05569601058959961,0.16115617752075195,0.13518619537353516,0.2251424789428711,0.09292387962341309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,True,True,Tests_passed,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,True,25,122,807,3,True,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,True,25,True,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,b8463a6e5f0d2feab7f831b99a1c19c7765a19b0a50a269de1cd61269a581703,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Tests_failed,afa44658f1c8df749150363300e6869e52f756f62c54048cbd3a0322521b1e35,Merge_failed,ce2eb3f2e23daa9a39d8ce2dea35187ae400837c8089263446c1d7297230e8db,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_failed,ae6813ea45e834c07ef545312ff76a750de16faea1605770872179edd2598633,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,5ea2703cb18c431823c70b36e42da10b2b260320bb340881b22ec2c939d3ad30,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,0.06889677047729492,0.07657957077026367,0.08522439002990723,0.11098933219909668,0.06861019134521484,0.08226394653320312,0.09406089782714844,0.1736316680908203,0.17258286476135254,1.2790298461914062,0.5993554592132568,0.05569601058959961,0.16115617752075195,0.13518619537353516,0.2251424789428711,0.09292387962341309,0.20316505432128906,0.21589207649230957,0.11918830871582031,0.24374914169311523,0.09290909767150879,0.22885370254516602,0.11986827850341797,0.30884766578674316,0.30161523818969727,1.3906586170196533,0.6640615463256836,0.0886847972869873,0.21241116523742676,0.1151576042175293,0.2089226245880127,0.12484908103942871 diff --git a/results/combined/merges_timed/ninjaframework/ninja.csv b/results/combined/merges_timed/ninjaframework/ninja.csv index 907cb5c0cc..acf3151013 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,Tests_passed,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,True,25,77,459,2,True,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,True,25,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_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_failed,d5281e578570fc68c03403ee5ccd0b9159c97dfcfe34dfe4d8f73684c0e2a684,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,a2e2a2fd2f9bbd297212f71a9f574db303d3455af2023f71dd8c78b032a94e98,Tests_failed,d5281e578570fc68c03403ee5ccd0b9159c97dfcfe34dfe4d8f73684c0e2a684,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.03295326232910156,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.0736551284790039,0.49148130416870117,0.5479385852813721,0.062026262283325195,0.08120560646057129,0.058013916015625,0.07470464706420898,0.08706998825073242 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,Tests_passed,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,True,25,77,459,2,True,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,True,25,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_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_failed,d5281e578570fc68c03403ee5ccd0b9159c97dfcfe34dfe4d8f73684c0e2a684,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,a2e2a2fd2f9bbd297212f71a9f574db303d3455af2023f71dd8c78b032a94e98,Tests_failed,d5281e578570fc68c03403ee5ccd0b9159c97dfcfe34dfe4d8f73684c0e2a684,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,8941118c184b4bafc4837294d0a620a1708e7d3b099bd3187748c5295dfb7df1,Tests_passed,66a93ecaab4d0275331327b9969c1cf15541e396e804d98431397c11231d2ec6,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.03295326232910156,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.0736551284790039,0.49148130416870117,0.5479385852813721,0.062026262283325195,0.08120560646057129,0.058013916015625,0.07470464706420898,0.08706998825073242,0.059400081634521484,0.06994438171386719,0.08272004127502441,0.08657264709472656,0.08119654655456543,0.08254265785217285,0.08220553398132324,0.12268733978271484,0.1142270565032959,0.5772442817687988,0.5698177814483643,0.07872557640075684,0.07481503486633301,0.07909679412841797,0.08052229881286621,0.05882692337036133 diff --git a/results/combined/merges_timed/ninjudd/drip.csv b/results/combined/merges_timed/ninjudd/drip.csv index e64403aa88..9ff4eec24f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,Tests_passed,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,True,8,11,216,2,True,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,True,8,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,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,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,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,79f25b3a954bfeb53bfa6d4fb7c86ef0e107dd5afa5809e2b6c967a9cdcb1fcd,Tests_passed,d6f07f542163e32969514025f73acef6a48518ab29353e39abcf7f4fb50938c0,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.012705326080322266,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.10643959045410156,0.7693829536437988,0.25475192070007324,0.027476072311401367,0.04928779602050781,0.02803349494934082,0.04897594451904297,0.04958081245422363 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,Tests_passed,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,True,8,11,216,2,True,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,True,8,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,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,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,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,79f25b3a954bfeb53bfa6d4fb7c86ef0e107dd5afa5809e2b6c967a9cdcb1fcd,Tests_passed,d6f07f542163e32969514025f73acef6a48518ab29353e39abcf7f4fb50938c0,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.012705326080322266,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.10643959045410156,0.7693829536437988,0.25475192070007324,0.027476072311401367,0.04928779602050781,0.02803349494934082,0.04897594451904297,0.04958081245422363,0.04737663269042969,0.04574012756347656,0.04912686347961426,0.04904437065124512,0.047774314880371094,0.04906415939331055,0.04753518104553223,0.07980155944824219,0.07774043083190918,0.7756297588348389,0.2793240547180176,0.04833507537841797,0.0480191707611084,0.048161983489990234,0.047965288162231445,0.048386573791503906 diff --git a/results/combined/merges_timed/nitnelave/creeperheal.csv b/results/combined/merges_timed/nitnelave/creeperheal.csv index b8a4e38c0c..dceb47969f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,True,62,285,2122,26,True,68,Tests_passed,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,True,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,True,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,0034daea793d632a8d5d1d5215c02f1561c9672279d452edb542c0cf6f9b7df8,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,Merge_failed,0bc449e1fc4f565ccb8913f13beb05f81a5968ace05afbfd295629312913a4e6,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,3fe5fdfaffe0bfb431a50d692383d2b9789be63f23615969f3f99106af00ea16,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,16aa77ee1b662632c7e75b59645ca84ef67e9c7f8bb9b443f580e9231d78c8ad,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,0.027543306350708008,0.027852535247802734,0.03082895278930664,0.0425412654876709,0.031462907791137695,0.03153514862060547,0.031139135360717773,0.2797353267669678,0.8721339702606201,6.757500886917114,1.0430614948272705,0.16677522659301758,0.2388308048248291,0.19952869415283203,0.2469630241394043,0.24878931045532227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,True,62,285,2122,26,True,68,Tests_passed,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,True,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,True,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,0034daea793d632a8d5d1d5215c02f1561c9672279d452edb542c0cf6f9b7df8,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,Merge_failed,0bc449e1fc4f565ccb8913f13beb05f81a5968ace05afbfd295629312913a4e6,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,3fe5fdfaffe0bfb431a50d692383d2b9789be63f23615969f3f99106af00ea16,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,16aa77ee1b662632c7e75b59645ca84ef67e9c7f8bb9b443f580e9231d78c8ad,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,0.027543306350708008,0.027852535247802734,0.03082895278930664,0.0425412654876709,0.031462907791137695,0.03153514862060547,0.031139135360717773,0.2797353267669678,0.8721339702606201,6.757500886917114,1.0430614948272705,0.16677522659301758,0.2388308048248291,0.19952869415283203,0.2469630241394043,0.24878931045532227,0.23094630241394043,0.20550799369812012,0.23292040824890137,0.24389147758483887,0.23880672454833984,0.24651789665222168,0.25116682052612305,0.5543651580810547,0.6718287467956543,7.280371904373169,1.2655694484710693,0.23404550552368164,0.23624444007873535,0.20719122886657715,0.23268699645996094,0.23347163200378418 diff --git a/results/combined/merges_timed/nlpchina/nlp-lang.csv b/results/combined/merges_timed/nlpchina/nlp-lang.csv index da4d430d56..947f23c6b5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,True,11,25,298,3,True,11,Tests_passed,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,True,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,True,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,f8718862436cf450d7ff2c0b871e492c19997344ad47498a4a3b9b19e279f452,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,2be38b7e7652587a8b0f42e1324634cc720888b03a3e81e4e8594203e8a3a8d5,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,d0240bbd1f709e2770d827e4e2b8938bb77403922c3c3c1f8f55a440559920e7,Tests_failed,357603b6720a982f083ba9b721098fe57165e845956e7dbca262e26d8b9beb9b,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,0.04969644546508789,0.0429387092590332,0.05030632019042969,0.06067609786987305,0.05286073684692383,0.04962468147277832,0.06367015838623047,0.17739295959472656,0.16393637657165527,0.9382648468017578,0.3409416675567627,0.09783601760864258,0.12033343315124512,0.10341358184814453,0.12356448173522949,0.11782121658325195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,True,11,25,298,3,True,11,Tests_passed,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,True,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,True,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,f8718862436cf450d7ff2c0b871e492c19997344ad47498a4a3b9b19e279f452,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,2be38b7e7652587a8b0f42e1324634cc720888b03a3e81e4e8594203e8a3a8d5,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,d0240bbd1f709e2770d827e4e2b8938bb77403922c3c3c1f8f55a440559920e7,Tests_failed,357603b6720a982f083ba9b721098fe57165e845956e7dbca262e26d8b9beb9b,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,0.04969644546508789,0.0429387092590332,0.05030632019042969,0.06067609786987305,0.05286073684692383,0.04962468147277832,0.06367015838623047,0.17739295959472656,0.16393637657165527,0.9382648468017578,0.3409416675567627,0.09783601760864258,0.12033343315124512,0.10341358184814453,0.12356448173522949,0.11782121658325195,0.12827491760253906,0.1198568344116211,0.1422438621520996,0.12913107872009277,0.0667567253112793,0.13338661193847656,0.137237548828125,0.19781041145324707,0.13289260864257812,1.1224822998046875,0.41576552391052246,0.12229537963867188,0.12263321876525879,0.06725335121154785,0.11551952362060547,0.12454462051391602 diff --git a/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv b/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv index 3f468b6c0e..158f8a6e29 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,True,6,10,292,2,True,6,Tests_passed,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,True,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,True,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,710cdeddfaa1c2a234689cd475cde53229627fb2beaf5bc5064d3c1b580af5fd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,60c274dfbd40e1f2d93af506351a30c47036e382673974a464b5144bd8da28bd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,16f5a65864567f04345af4927c9359976fee238cfd7caf5d28ca24b88955a16f,Tests_failed,8e10de3535ce4a489c43986f2f8fef8243df785caf27d38c5fb8b99bc914dc49,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,0.04317355155944824,0.04027056694030762,0.04572701454162598,0.015298843383789062,0.04216766357421875,0.018129348754882812,0.04470467567443848,0.1794588565826416,0.1035761833190918,1.1465511322021484,0.3630499839782715,0.04194784164428711,0.044284820556640625,0.04189181327819824,0.048917293548583984,0.04899859428405762 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,True,6,10,292,2,True,6,Tests_passed,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,True,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,True,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,710cdeddfaa1c2a234689cd475cde53229627fb2beaf5bc5064d3c1b580af5fd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,60c274dfbd40e1f2d93af506351a30c47036e382673974a464b5144bd8da28bd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,16f5a65864567f04345af4927c9359976fee238cfd7caf5d28ca24b88955a16f,Tests_failed,8e10de3535ce4a489c43986f2f8fef8243df785caf27d38c5fb8b99bc914dc49,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,0.04317355155944824,0.04027056694030762,0.04572701454162598,0.015298843383789062,0.04216766357421875,0.018129348754882812,0.04470467567443848,0.1794588565826416,0.1035761833190918,1.1465511322021484,0.3630499839782715,0.04194784164428711,0.044284820556640625,0.04189181327819824,0.048917293548583984,0.04899859428405762,0.046658992767333984,0.04828763008117676,0.047332048416137695,0.04883241653442383,0.04719662666320801,0.048429012298583984,0.047918081283569336,0.08377385139465332,0.08299875259399414,1.3000872135162354,0.45451784133911133,0.04785013198852539,0.04753470420837402,0.04867434501647949,0.0489497184753418,0.048856496810913086 diff --git a/results/combined/merges_timed/northconcepts/event-bus.csv b/results/combined/merges_timed/northconcepts/event-bus.csv index 90e3fd60dc..49ef74140b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,True,True,Tests_passed,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,True,30,29,2638,25,True,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,True,30,True,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,28030c4fd07f6720c4327b8cabdc937631909a2e08013c80d6a7547e78bf1e33,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,0.04859781265258789,0.04040837287902832,0.047167301177978516,0.015505075454711914,0.04579353332519531,0.04448342323303223,0.051868438720703125,1.5791490077972412,1.3922944068908691,9.710896968841553,0.29674696922302246,0.13202238082885742,0.13483262062072754,0.13416075706481934,0.1333615779876709,0.13036394119262695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,True,True,Tests_passed,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,True,30,29,2638,25,True,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,True,30,True,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,28030c4fd07f6720c4327b8cabdc937631909a2e08013c80d6a7547e78bf1e33,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,0.04859781265258789,0.04040837287902832,0.047167301177978516,0.015505075454711914,0.04579353332519531,0.04448342323303223,0.051868438720703125,1.5791490077972412,1.3922944068908691,9.710896968841553,0.29674696922302246,0.13202238082885742,0.13483262062072754,0.13416075706481934,0.1333615779876709,0.13036394119262695,0.12795495986938477,0.1272258758544922,0.12965178489685059,0.12869691848754883,0.13135647773742676,0.13158178329467773,0.1309337615966797,0.5312142372131348,0.7200362682342529,9.666691541671753,0.4260103702545166,0.1298658847808838,0.12923049926757812,0.13009071350097656,0.1306149959564209,0.1282346248626709 diff --git a/results/combined/merges_timed/northlander/a.csv b/results/combined/merges_timed/northlander/a.csv index 210714f114..9e3a61b7c7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,False,True,8,37,127,2,True,8,Tests_passed,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,True,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,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,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,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,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6dfd07a56f4c2bf2a34b74b67d60f31801699c7cef27c8a73307602ae70ad94b,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,0.045340538024902344,0.05103445053100586,0.04937148094177246,0.020759105682373047,0.04775071144104004,0.05816221237182617,0.04204130172729492,0.1711881160736084,0.1081082820892334,1.9339265823364258,0.6627664566040039,0.0378878116607666,0.06937956809997559,0.039023637771606445,0.06770849227905273,0.07172393798828125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,False,True,8,37,127,2,True,8,Tests_passed,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,True,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,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,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,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,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6dfd07a56f4c2bf2a34b74b67d60f31801699c7cef27c8a73307602ae70ad94b,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,0.045340538024902344,0.05103445053100586,0.04937148094177246,0.020759105682373047,0.04775071144104004,0.05816221237182617,0.04204130172729492,0.1711881160736084,0.1081082820892334,1.9339265823364258,0.6627664566040039,0.0378878116607666,0.06937956809997559,0.039023637771606445,0.06770849227905273,0.07172393798828125,0.07086753845214844,0.06931662559509277,0.0713651180267334,0.06968235969543457,0.06987667083740234,0.0694429874420166,0.07303214073181152,0.10640621185302734,0.1007699966430664,2.1593897342681885,0.760427713394165,0.07170414924621582,0.06834101676940918,0.0700831413269043,0.06734180450439453,0.07108688354492188 diff --git a/results/combined/merges_timed/nuodb/migration-tools.csv b/results/combined/merges_timed/nuodb/migration-tools.csv index 657fb2b7d2..04d9f8f414 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,True,62,200,905.0,2,True,62,Tests_passed,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,True,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,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,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,755a8aa6454ec08acc50d5ee1cf0741bb22fd71fbee0f1b6c1b7b2539c6bc23a,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,20fd5e1f826b76bd14f5909dbbc3ed5f79034c011983e5437ee77963167bd2ae,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,0.014458179473876953,0.0141143798828125,0.01933431625366211,0.026482105255126953,0.018814563751220703,0.019374847412109375,0.018883943557739258,0.05360579490661621,0.07284140586853027,0.6310319900512695,0.8571913242340088,0.05060839653015137,0.05226445198059082,0.04489564895629883,0.05408143997192383,0.05101156234741211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,True,62,200,905.0,2,True,62,Tests_passed,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,True,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,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,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,755a8aa6454ec08acc50d5ee1cf0741bb22fd71fbee0f1b6c1b7b2539c6bc23a,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,20fd5e1f826b76bd14f5909dbbc3ed5f79034c011983e5437ee77963167bd2ae,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,0.014458179473876953,0.0141143798828125,0.01933431625366211,0.026482105255126953,0.018814563751220703,0.019374847412109375,0.018883943557739258,0.05360579490661621,0.07284140586853027,0.6310319900512695,0.8571913242340088,0.05060839653015137,0.05226445198059082,0.04489564895629883,0.05408143997192383,0.05101156234741211,0.053728580474853516,0.0475916862487793,0.05855965614318848,0.052591800689697266,0.05786395072937012,0.05229377746582031,0.056555747985839844,0.0795896053314209,0.0901343822479248,0.723736047744751,0.8989553451538086,0.05283188819885254,0.05384969711303711,0.04960179328918457,0.05223560333251953,0.04877829551696777 diff --git a/results/combined/merges_timed/nurkiewicz/async-retry.csv b/results/combined/merges_timed/nurkiewicz/async-retry.csv index aacfb5ac6d..07a00bd4fd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,True,True,Tests_passed,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,True,31,182,1051,3,True,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,True,31,True,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,8a17901df483804459d318ec045e6b11402ae49a76b49ff35d7333ff83f78a76,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Tests_failed,c25e1281413859123cc4268dc26e8e5a885283b3de749af7329d140b3dcbcb2b,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,42e95a4f92ced0eb0a2cccb9fddf0c2752d9a8dc489e8758bb9b7e84f125ab6c,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,ea85c93cf37177c0382b5fb64aa8938351aa415e83db4e52e803232f8bc85874,Tests_failed,b076ac6620c5d9e207bbba70b45fdfd3c977ad70fc31e04b8b89ccc7dc35f52d,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,0.03711652755737305,0.030425071716308594,0.042678117752075195,0.014227151870727539,0.03984880447387695,0.042803049087524414,0.03744173049926758,0.23548436164855957,0.16401362419128418,1.2028391361236572,0.6140575408935547,0.041471004486083984,0.061609745025634766,0.04170370101928711,0.06348013877868652,0.06408143043518066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,True,True,Tests_passed,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,True,31,182,1051,3,True,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,True,31,True,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,8a17901df483804459d318ec045e6b11402ae49a76b49ff35d7333ff83f78a76,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Tests_failed,c25e1281413859123cc4268dc26e8e5a885283b3de749af7329d140b3dcbcb2b,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,42e95a4f92ced0eb0a2cccb9fddf0c2752d9a8dc489e8758bb9b7e84f125ab6c,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,ea85c93cf37177c0382b5fb64aa8938351aa415e83db4e52e803232f8bc85874,Tests_failed,b076ac6620c5d9e207bbba70b45fdfd3c977ad70fc31e04b8b89ccc7dc35f52d,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,0.03711652755737305,0.030425071716308594,0.042678117752075195,0.014227151870727539,0.03984880447387695,0.042803049087524414,0.03744173049926758,0.23548436164855957,0.16401362419128418,1.2028391361236572,0.6140575408935547,0.041471004486083984,0.061609745025634766,0.04170370101928711,0.06348013877868652,0.06408143043518066,0.06192517280578613,0.06049609184265137,0.0614013671875,0.060643911361694336,0.06034374237060547,0.060332536697387695,0.06001448631286621,0.1069478988647461,0.11962532997131348,1.2684876918792725,0.6645040512084961,0.06050705909729004,0.06080055236816406,0.061441898345947266,0.06178164482116699,0.06259775161743164 diff --git a/results/combined/merges_timed/nurkiewicz/java8-workshop.csv b/results/combined/merges_timed/nurkiewicz/java8-workshop.csv index 63a0c509d1..e1fa187731 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,True,52,259,1045,2,True,52,Tests_passed,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,True,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,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,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,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,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_passed,85e2a5b9870610fcf3ebbd538bcdf0c7ad5e73366343ecef2ddb5ead00581a1e,Tests_failed,8bd1ce8f76e3190e29f319d73a2fbccaec209a747ee38371309b2bbfdbc0aab9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,0.047316789627075195,0.04183363914489746,0.05511879920959473,0.02458643913269043,0.053025007247924805,0.04347085952758789,0.04852414131164551,0.197113037109375,0.12619829177856445,0.591372013092041,0.6620934009552002,0.040633440017700195,0.06564092636108398,0.042824506759643555,0.06591463088989258,0.06568431854248047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,True,52,259,1045,2,True,52,Tests_passed,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,True,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,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,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,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,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_passed,85e2a5b9870610fcf3ebbd538bcdf0c7ad5e73366343ecef2ddb5ead00581a1e,Tests_failed,8bd1ce8f76e3190e29f319d73a2fbccaec209a747ee38371309b2bbfdbc0aab9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,0.047316789627075195,0.04183363914489746,0.05511879920959473,0.02458643913269043,0.053025007247924805,0.04347085952758789,0.04852414131164551,0.197113037109375,0.12619829177856445,0.591372013092041,0.6620934009552002,0.040633440017700195,0.06564092636108398,0.042824506759643555,0.06591463088989258,0.06568431854248047,0.06396722793579102,0.06605362892150879,0.06890344619750977,0.07089614868164062,0.06855320930480957,0.06966638565063477,0.06486701965332031,0.09757137298583984,0.10260486602783203,0.6929476261138916,0.7810842990875244,0.06668806076049805,0.06574487686157227,0.06537628173828125,0.06653976440429688,0.06632614135742188 diff --git a/results/combined/merges_timed/nutzam/nutzwx.csv b/results/combined/merges_timed/nutzam/nutzwx.csv index e63908c913..04d7656f65 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,True,8,34,257,3,True,8,Tests_passed,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,True,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,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,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,147aaada0f092b6247690a742d8941cdfbf36f7a53ac1ed6d449679620a12ddd,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,93859693e4ecb08f54c0fa112043430d48705153aaad6e1dfcf32f10cf175959,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,0.009784460067749023,0.009897470474243164,0.010537147521972656,0.01774907112121582,0.010214090347290039,0.010202884674072266,0.009931087493896484,0.048341989517211914,0.12211942672729492,0.8560028076171875,0.4585001468658447,0.04326343536376953,0.06842565536499023,0.04484438896179199,0.06778216361999512,0.06507158279418945 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,True,8,34,257,3,True,8,Tests_passed,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,True,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,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,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,147aaada0f092b6247690a742d8941cdfbf36f7a53ac1ed6d449679620a12ddd,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,93859693e4ecb08f54c0fa112043430d48705153aaad6e1dfcf32f10cf175959,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,0.009784460067749023,0.009897470474243164,0.010537147521972656,0.01774907112121582,0.010214090347290039,0.010202884674072266,0.009931087493896484,0.048341989517211914,0.12211942672729492,0.8560028076171875,0.4585001468658447,0.04326343536376953,0.06842565536499023,0.04484438896179199,0.06778216361999512,0.06507158279418945,0.06671380996704102,0.06644153594970703,0.06746578216552734,0.0649867057800293,0.06741094589233398,0.0682065486907959,0.06679272651672363,0.11743497848510742,0.13338470458984375,0.9998996257781982,0.5724186897277832,0.0675661563873291,0.06744980812072754,0.06667804718017578,0.06601905822753906,0.06633400917053223 diff --git a/results/combined/merges_timed/nysenate/openlegislation.csv b/results/combined/merges_timed/nysenate/openlegislation.csv index fe1671bfb6..1671e23b08 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -152,refs/heads/dev,617199a3390afb9c4607d24820940d0d544d2bb6,3924b1c2492cd9047f0d09368d1d3cefee9d1e9b,844efdd518e615a3e1d6ec15f8df1b12fb875a48,,True,,True,336,763,,3,True,336,Tests_passed,f5282d765df57026df2e93e623d0677a09c7c2daea635653064412da4f62e8df,True,Tests_passed,30cda5931c2fa46f5de116170aef7d2f850bf96ab807cb53df0ecfc3b5e67024,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,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_failed,2b991da308946cab04186d8cda4f69ab478df53101f6d32e7d0fc963f6ed4e6d,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,15f0888328dabf20af0747ba66af965e90d6b1359ee5425aefe30610554705f9,Tests_failed,0987a824cc45d50fcc60dec066c3528e43bd600ed64f76d96a8183bbb8f66c4d,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,0.06009316444396973,0.06657958030700684,0.09014725685119629,0.08522629737854004,0.09430885314941406,0.09638261795043945,0.09883522987365723,0.24809694290161133,0.1816878318786621,0.9772994518280029,3.4585764408111572,0.12489557266235352,0.1987137794494629,0.12951993942260742,0.19492483139038086,0.19301438331604004 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +152,refs/heads/dev,617199a3390afb9c4607d24820940d0d544d2bb6,3924b1c2492cd9047f0d09368d1d3cefee9d1e9b,844efdd518e615a3e1d6ec15f8df1b12fb875a48,,True,,True,336,763,,3,True,336,Tests_passed,f5282d765df57026df2e93e623d0677a09c7c2daea635653064412da4f62e8df,True,Tests_passed,30cda5931c2fa46f5de116170aef7d2f850bf96ab807cb53df0ecfc3b5e67024,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,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_failed,2b991da308946cab04186d8cda4f69ab478df53101f6d32e7d0fc963f6ed4e6d,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,15f0888328dabf20af0747ba66af965e90d6b1359ee5425aefe30610554705f9,Tests_failed,0987a824cc45d50fcc60dec066c3528e43bd600ed64f76d96a8183bbb8f66c4d,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,Tests_passed,2a93bbcac29ec65f4ac86dc4c4e75c6147ca0db33f912bd936d96a8ebd72dd79,0.06009316444396973,0.06657958030700684,0.09014725685119629,0.08522629737854004,0.09430885314941406,0.09638261795043945,0.09883522987365723,0.24809694290161133,0.1816878318786621,0.9772994518280029,3.4585764408111572,0.12489557266235352,0.1987137794494629,0.12951993942260742,0.19492483139038086,0.19301438331604004,0.17992115020751953,0.1799318790435791,0.2050034999847412,0.21018171310424805,0.21171045303344727,0.20928716659545898,0.2141861915588379,0.2812678813934326,0.2496044635772705,1.0932931900024414,3.4664111137390137,0.18898344039916992,0.1823596954345703,0.18310093879699707,0.18851065635681152,0.17732930183410645 diff --git a/results/combined/merges_timed/oaqa/baseqa.csv b/results/combined/merges_timed/oaqa/baseqa.csv index 254b1e5325..ff85d94dd4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,True,True,Tests_passed,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,True,86,229,1433,2,True,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,True,86,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,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Merge_timedout,,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,0e2de159fe5752e1b2aeab8fc5ae34a5f0c9d824da5c1f180b2cb61610d9c85d,Merge_timedout,,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,0.05147099494934082,0.039757490158081055,0.06374859809875488,0.024109840393066406,0.06072831153869629,0.049942731857299805,0.05056405067443848,0.1877901554107666,0.11146020889282227,0.7615728378295898,-1.0,0.04333043098449707,0.06657242774963379,0.043434858322143555,0.06993889808654785,0.06616377830505371 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,True,True,Tests_passed,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,True,86,229,1433,2,True,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,True,86,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,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Merge_timedout,,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,0e2de159fe5752e1b2aeab8fc5ae34a5f0c9d824da5c1f180b2cb61610d9c85d,Merge_timedout,,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,b441f2c79d9fdbde30b8dbdf62a6662cb202b0f624f014eef2a6219d8059d0f2,Tests_passed,26f44883b5ff0ccdf4759e884bed5c3a9517fab5b29c3b568c4382f430a6e300,0.05147099494934082,0.039757490158081055,0.06374859809875488,0.024109840393066406,0.06072831153869629,0.049942731857299805,0.05056405067443848,0.1877901554107666,0.11146020889282227,0.7615728378295898,-1.0,0.04333043098449707,0.06657242774963379,0.043434858322143555,0.06993889808654785,0.06616377830505371,0.06528663635253906,0.06764554977416992,0.06639218330383301,0.06979203224182129,0.06938338279724121,0.06909608840942383,0.0667562484741211,0.10391449928283691,0.09946393966674805,0.7873966693878174,-1.0,0.06308722496032715,0.0651087760925293,0.06276226043701172,0.06488728523254395,0.06589055061340332 diff --git a/results/combined/merges_timed/oauth-apis/apis.csv b/results/combined/merges_timed/oauth-apis/apis.csv index a42b5c5cfc..7815eba3a4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,True,True,Tests_passed,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,True,40,116,1688,4,True,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,True,40,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,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Merge_timedout,,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,3a8ef32f3a56cd51b28fd2eed5ac77907dce407278d1bc48ee295c84f9f60ee2,Merge_timedout,,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,0.013796329498291016,0.05196690559387207,0.058976173400878906,0.0559079647064209,0.023813247680664062,0.05260205268859863,0.027321815490722656,0.2602975368499756,0.23450231552124023,0.6113884449005127,-1.0,0.0394136905670166,0.15430808067321777,0.04005885124206543,0.1541299819946289,0.10458159446716309 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,True,True,Tests_passed,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,True,40,116,1688,4,True,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,True,40,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,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Merge_timedout,,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,3a8ef32f3a56cd51b28fd2eed5ac77907dce407278d1bc48ee295c84f9f60ee2,Merge_timedout,,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,7730d605da7f3d4e47bcc0c080b872aeae5e06afafe45eeeb2e24e40be78c252,Tests_passed,d4e827f5eed36247d4f227fff6aa016e830c1f4a91a2949087465bffff22bc63,0.013796329498291016,0.05196690559387207,0.058976173400878906,0.0559079647064209,0.023813247680664062,0.05260205268859863,0.027321815490722656,0.2602975368499756,0.23450231552124023,0.6113884449005127,-1.0,0.0394136905670166,0.15430808067321777,0.04005885124206543,0.1541299819946289,0.10458159446716309,0.15592646598815918,0.10444760322570801,0.1663215160369873,0.17053985595703125,0.10445570945739746,0.16570162773132324,0.10561609268188477,0.1731584072113037,0.22490406036376953,0.7143609523773193,-1.0,0.15499544143676758,0.10145139694213867,0.153975248336792,0.16047191619873047,0.10222673416137695 diff --git a/results/combined/merges_timed/obourgain/elasticsearch-http.csv b/results/combined/merges_timed/obourgain/elasticsearch-http.csv index 159ff2b979..2ec6a6f82f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,True,9,20,53,2,True,9,Tests_passed,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,True,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,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,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,597f6a00c4ff0ba7ababef5f6d1eb5d5caa7d2b4a85abccd80b2e0719bab1030,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,0.038735389709472656,0.03929400444030762,0.04864645004272461,0.015951871871948242,0.03846907615661621,0.04492497444152832,0.050650835037231445,0.17865633964538574,0.12567925453186035,0.6965408325195312,0.3751680850982666,0.056659698486328125,0.05911612510681152,0.0437471866607666,0.04492330551147461,0.045499324798583984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,True,9,20,53,2,True,9,Tests_passed,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,True,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,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,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,597f6a00c4ff0ba7ababef5f6d1eb5d5caa7d2b4a85abccd80b2e0719bab1030,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,0.038735389709472656,0.03929400444030762,0.04864645004272461,0.015951871871948242,0.03846907615661621,0.04492497444152832,0.050650835037231445,0.17865633964538574,0.12567925453186035,0.6965408325195312,0.3751680850982666,0.056659698486328125,0.05911612510681152,0.0437471866607666,0.04492330551147461,0.045499324798583984,0.0446629524230957,0.04425358772277832,0.06400680541992188,0.059908151626586914,0.044344425201416016,0.04395413398742676,0.044450998306274414,0.07926774024963379,0.1068716049194336,0.7890605926513672,0.4601762294769287,0.055733680725097656,0.045517683029174805,0.04426383972167969,0.04306149482727051,0.04454946517944336 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 acd786f7b0..1aae8a9e18 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,True,False,True,6,8,15,2,True,6,Tests_passed,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,True,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,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,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,c1712e620672b89246973a2e1bd87de69b1770c8d5bf69fad28747ec1ff3c3c5,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,f4c62657fd43c0baa22dfcb01d43e4b2f33a12da08b2d02953dfd7f1a542d72e,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,0.03889012336730957,0.037157535552978516,0.03292274475097656,0.02109551429748535,0.04157662391662598,0.05319952964782715,0.02937030792236328,0.17003321647644043,0.09879469871520996,0.8279085159301758,0.3351433277130127,0.05153512954711914,0.049723148345947266,0.05052328109741211,0.05025339126586914,0.04951071739196777 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,True,False,True,6,8,15,2,True,6,Tests_passed,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,True,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,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,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,c1712e620672b89246973a2e1bd87de69b1770c8d5bf69fad28747ec1ff3c3c5,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,f4c62657fd43c0baa22dfcb01d43e4b2f33a12da08b2d02953dfd7f1a542d72e,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,0.03889012336730957,0.037157535552978516,0.03292274475097656,0.02109551429748535,0.04157662391662598,0.05319952964782715,0.02937030792236328,0.17003321647644043,0.09879469871520996,0.8279085159301758,0.3351433277130127,0.05153512954711914,0.049723148345947266,0.05052328109741211,0.05025339126586914,0.04951071739196777,0.04633283615112305,0.04781842231750488,0.04746413230895996,0.04980778694152832,0.05148577690124512,0.047124624252319336,0.04987478256225586,0.0837247371673584,0.08907270431518555,0.8681232929229736,0.38782167434692383,0.048358917236328125,0.05006098747253418,0.05106616020202637,0.04866743087768555,0.04642438888549805 diff --git a/results/combined/merges_timed/okjsp/okmakeover.csv b/results/combined/merges_timed/okjsp/okmakeover.csv index 7b7d97a5ba..ad44e6a938 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,True,True,True,13,23,375.0,8,True,17,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,True,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,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_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,0.014624357223510742,0.03885507583618164,0.03925061225891113,0.016034603118896484,0.04259133338928223,0.01197195053100586,0.04102969169616699,0.09719228744506836,0.047421932220458984,0.05131864547729492,0.35125279426574707,0.03243827819824219,0.09552288055419922,0.03300666809082031,0.09630966186523438,0.09415936470031738 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,True,True,True,13,23,375.0,8,True,17,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,True,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,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_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,Tests_passed,b6c66fce24adb8abecd3935d22ecb8e03a442b13844c113c3f0bf9c9a22c1594,0.014624357223510742,0.03885507583618164,0.03925061225891113,0.016034603118896484,0.04259133338928223,0.01197195053100586,0.04102969169616699,0.09719228744506836,0.047421932220458984,0.05131864547729492,0.35125279426574707,0.03243827819824219,0.09552288055419922,0.03300666809082031,0.09630966186523438,0.09415936470031738,0.09168887138366699,0.13124918937683105,0.0901486873626709,0.09366488456726074,0.09338808059692383,0.09050607681274414,0.09458804130554199,0.10599350929260254,0.0993490219116211,0.10398697853088379,0.373732328414917,0.09032773971557617,0.08987545967102051,0.0922081470489502,0.09070110321044922,0.09358572959899902 diff --git a/results/combined/merges_timed/okleine/ncoap.csv b/results/combined/merges_timed/okleine/ncoap.csv index 5fdcb90022..aa4f21ee5d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,c30070ba7131b8a69119638d8e1109f140d22e85,6bcb914a5723ca8d94947558039072f2d3c517b7,ad88f96ad06b9e2856a91bc9ff316b37df250f78,,True,True,Tests_passed,4f67feea8f5fd0d410dd3d602b35610ccc2cdbd628236a6e0f160d823e1d4bb4,True,32,154,772,14,True,Tests_passed,5eb1bc97eb07f240ee71e8096f1e0797c16be3bf77a24e49b3625d24fc453068,True,32,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,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,5988a57483643869e4170bab755b553bc8f9167c6f20a6943785f6f9626da6a9,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,1e7dc784687d6fac4b088dcc08854bedf6a67124f225300aa354d9ceafd2a6a2,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,450273d98279a7839eec15c3a8a2b48e628d3aef8baa2e1b3f5457a2bf80f727,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,0.03443169593811035,0.05168962478637695,0.026373624801635742,0.019106149673461914,0.014947652816772461,0.02424001693725586,0.034313201904296875,0.2811319828033447,0.7209959030151367,9.971847295761108,0.6172811985015869,0.0782778263092041,0.28232598304748535,0.07862305641174316,0.2845122814178467,0.28715085983276367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,c30070ba7131b8a69119638d8e1109f140d22e85,6bcb914a5723ca8d94947558039072f2d3c517b7,ad88f96ad06b9e2856a91bc9ff316b37df250f78,,True,True,Tests_passed,4f67feea8f5fd0d410dd3d602b35610ccc2cdbd628236a6e0f160d823e1d4bb4,True,32,154,772,14,True,Tests_passed,5eb1bc97eb07f240ee71e8096f1e0797c16be3bf77a24e49b3625d24fc453068,True,32,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,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,5988a57483643869e4170bab755b553bc8f9167c6f20a6943785f6f9626da6a9,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,1e7dc784687d6fac4b088dcc08854bedf6a67124f225300aa354d9ceafd2a6a2,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,450273d98279a7839eec15c3a8a2b48e628d3aef8baa2e1b3f5457a2bf80f727,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,14113c9b2f15e5bc0e46cfbf0388c0799b540ea430de1689a9e6cf88ac13c2fa,Merge_failed,d0d3713ec8fadb74013894492d17e5acc7df7644aed26f61de8c921f407c9051,0.03443169593811035,0.05168962478637695,0.026373624801635742,0.019106149673461914,0.014947652816772461,0.02424001693725586,0.034313201904296875,0.2811319828033447,0.7209959030151367,9.971847295761108,0.6172811985015869,0.0782778263092041,0.28232598304748535,0.07862305641174316,0.2845122814178467,0.28715085983276367,0.27049946784973145,0.2727665901184082,0.26596999168395996,0.27051830291748047,0.27222180366516113,0.2646646499633789,0.26413440704345703,0.4889974594116211,0.5648260116577148,9.773664712905884,0.8983807563781738,0.2711927890777588,0.26838111877441406,0.26698851585388184,0.26791977882385254,0.267458438873291 diff --git a/results/combined/merges_timed/oldhu/suunto2nike.csv b/results/combined/merges_timed/oldhu/suunto2nike.csv index 55a8440fed..bb41c05795 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,True,25,24,4021,3,True,25,Tests_passed,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,True,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,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,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_timedout,,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,11ca208a7dd8f1ab6a83c2d2e30a1529fadf76caa82cdddf2bf759a61f6735b6,Merge_failed,fc4b1a0721c17204ea95801cdecefd41bbba8c60e1dc23d7e0a0784c00d65041,Merge_failed,3252c60341c1924337def41905bb34c73a2a102e31b48e217d881d14366e6370,Merge_timedout,,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,0.043988943099975586,0.04529237747192383,0.03787636756896973,0.015661001205444336,0.04005908966064453,0.03855752944946289,0.03802132606506348,0.22986125946044922,0.17063236236572266,0.7147586345672607,-1.0,0.05216383934020996,0.06192922592163086,0.052184343338012695,0.062194108963012695,0.07252669334411621 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,True,25,24,4021,3,True,25,Tests_passed,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,True,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,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,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_timedout,,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,11ca208a7dd8f1ab6a83c2d2e30a1529fadf76caa82cdddf2bf759a61f6735b6,Merge_failed,fc4b1a0721c17204ea95801cdecefd41bbba8c60e1dc23d7e0a0784c00d65041,Merge_failed,3252c60341c1924337def41905bb34c73a2a102e31b48e217d881d14366e6370,Merge_timedout,,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Merge_failed,f97627cf2037fb367b78d64d13354d6ffceed7a92848e06077b756c8af2257d0,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,0.043988943099975586,0.04529237747192383,0.03787636756896973,0.015661001205444336,0.04005908966064453,0.03855752944946289,0.03802132606506348,0.22986125946044922,0.17063236236572266,0.7147586345672607,-1.0,0.05216383934020996,0.06192922592163086,0.052184343338012695,0.062194108963012695,0.07252669334411621,0.06243085861206055,0.0723123550415039,0.06191539764404297,0.07170629501342773,0.06165957450866699,0.06106829643249512,0.06075024604797363,0.10885405540466309,0.12208056449890137,0.7769851684570312,-1.0,0.06288766860961914,0.06103658676147461,0.06117534637451172,0.0612940788269043,0.07410407066345215 diff --git a/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv b/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv index a016668fd0..e7d6613d07 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,bb231f3e76333a9347906b09a882158084a3a888479529402547d4b86f197294,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,876c1453e34d57598efc9368bbed8de0bcc5a47607459291cd1fdbd000116c58,Merge_failed,b6305d5a398db78a750f701f3e1b8fdca5144be1e05d942761bbccd7322e3d63,Merge_failed,b6305d5a398db78a750f701f3e1b8fdca5144be1e05d942761bbccd7322e3d63,Merge_failed,325041173ccf387bd1e9adf16e5eeede0c96b204b28181feb3b350f7a2ac9a1e,Merge_failed,8effe5cb03ed4cdad0f4bc745a97eb3a119d3b5f95207e9eaf1d41007fdeb81b,Merge_failed,a9b0ee6fdf3971b7802c174a3c0a4226a073b22c971e9f352d884b27d2aaafd0,Merge_failed,bddec0a69bad1911610af4c02fa685ceff6c5561a4cfb18c7b4c74f61d6a2046,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.026328563690185547,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,1.9398653507232666,19.027888774871826,2.521711587905884,0.4978306293487549,0.42679429054260254,1.2499322891235352,1.4332914352416992,0.5307106971740723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,bb231f3e76333a9347906b09a882158084a3a888479529402547d4b86f197294,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,876c1453e34d57598efc9368bbed8de0bcc5a47607459291cd1fdbd000116c58,Merge_failed,b6305d5a398db78a750f701f3e1b8fdca5144be1e05d942761bbccd7322e3d63,Merge_failed,b6305d5a398db78a750f701f3e1b8fdca5144be1e05d942761bbccd7322e3d63,Merge_failed,325041173ccf387bd1e9adf16e5eeede0c96b204b28181feb3b350f7a2ac9a1e,Merge_failed,8effe5cb03ed4cdad0f4bc745a97eb3a119d3b5f95207e9eaf1d41007fdeb81b,Merge_failed,a9b0ee6fdf3971b7802c174a3c0a4226a073b22c971e9f352d884b27d2aaafd0,Merge_failed,bddec0a69bad1911610af4c02fa685ceff6c5561a4cfb18c7b4c74f61d6a2046,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,83def32f974b3a5b412d91dddc7b9385799d06f7a672bc4453997996d5494375,Merge_failed,b09164bb13ef66d98c78d6c002923be2326d8f239bdc3d7c737b91490076a5c2,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.026328563690185547,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,1.9398653507232666,19.027888774871826,2.521711587905884,0.4978306293487549,0.42679429054260254,1.2499322891235352,1.4332914352416992,0.5307106971740723,1.4186716079711914,0.5132613182067871,1.4011943340301514,0.4900846481323242,1.7790007591247559,1.763476848602295,1.8924674987792969,2.3494937419891357,2.6149322986602783,19.246822595596313,4.009806871414185,1.3990466594696045,1.411182165145874,1.4020297527313232,1.4006376266479492,0.49800968170166016 diff --git a/results/combined/merges_timed/olibye/guvna.csv b/results/combined/merges_timed/olibye/guvna.csv index fd54f455f9..9de3cccdf6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,True,8,39,368,12,True,14,Tests_passed,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,True,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,86da33ef71e8e5b53d3b9ef68d7caeef6ecebf8bc1c9454c3a4d703f3f94f3d8,Merge_failed,007702719f56b03fc245a9fa70c26a6cbe615477bd5eeb36efdfe122bf961188,Merge_failed,007702719f56b03fc245a9fa70c26a6cbe615477bd5eeb36efdfe122bf961188,Merge_failed,412c188b3d8c0f77cdae736b45e6730a83780291be0a2c01a7609e2b942ce75b,Merge_failed,6ad4c5962d10c42871350a5e0817603cf0505d596dfa70ac9badf3d41c033029,Merge_failed,5c4130bb8b3bff4d105e31a3a6f316eef38c7f816e5d93e6bf1a15c042ce1de0,Merge_failed,557b8124a1646d7d13480ec5022058f67bb4327a18b3954279ddedb9c964b94a,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,0.041321754455566406,0.0423276424407959,0.03586220741271973,0.013406038284301758,0.03398013114929199,0.0406496524810791,0.041594505310058594,0.26343798637390137,0.3589797019958496,1.4761738777160645,0.4797399044036865,0.07705497741699219,0.08009791374206543,0.09220170974731445,0.10227251052856445,0.09363698959350586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,True,8,39,368,12,True,14,Tests_passed,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,True,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,86da33ef71e8e5b53d3b9ef68d7caeef6ecebf8bc1c9454c3a4d703f3f94f3d8,Merge_failed,007702719f56b03fc245a9fa70c26a6cbe615477bd5eeb36efdfe122bf961188,Merge_failed,007702719f56b03fc245a9fa70c26a6cbe615477bd5eeb36efdfe122bf961188,Merge_failed,412c188b3d8c0f77cdae736b45e6730a83780291be0a2c01a7609e2b942ce75b,Merge_failed,6ad4c5962d10c42871350a5e0817603cf0505d596dfa70ac9badf3d41c033029,Merge_failed,5c4130bb8b3bff4d105e31a3a6f316eef38c7f816e5d93e6bf1a15c042ce1de0,Merge_failed,557b8124a1646d7d13480ec5022058f67bb4327a18b3954279ddedb9c964b94a,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,a299dd92c935bfa3e37cf3008ced9b24099985f503c1ca47ba8d1c226f69f63f,Merge_failed,8f4146978cf84ab1952d6e7f9e5f29840b785e2f2dfe03227ad8e270bfa288fa,0.041321754455566406,0.0423276424407959,0.03586220741271973,0.013406038284301758,0.03398013114929199,0.0406496524810791,0.041594505310058594,0.26343798637390137,0.3589797019958496,1.4761738777160645,0.4797399044036865,0.07705497741699219,0.08009791374206543,0.09220170974731445,0.10227251052856445,0.09363698959350586,0.10229802131652832,0.08749699592590332,0.10065269470214844,0.08869314193725586,0.10947823524475098,0.11035752296447754,0.11518430709838867,0.19753718376159668,0.25209474563598633,1.581833839416504,0.5930111408233643,0.10107874870300293,0.1004946231842041,0.09924530982971191,0.10383105278015137,0.08995532989501953 diff --git a/results/combined/merges_timed/oltpbenchmark/oltpbench.csv b/results/combined/merges_timed/oltpbenchmark/oltpbench.csv index c4816905c4..4cf391c3bd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,True,,True,1308,3597,,139,True,1367,Tests_passed,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,True,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,True,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,8187fa98e68a15e2044b13115cd3f5c2d74045d5e3051be7b2a03869ec44143b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,Merge_failed,13ef0312ef3799db7299625ce28bbaf6ef8868c2cf61fa768bd65f254ccf560a,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,26b21b3ca81915f28016d800fd4f0c3813ef2fe6d7974c73212d1b8edccbae25,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,042e97e12d816f90e916182635fda912628a8a0ccedfeb8e29b1df661684f1ee,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,1.0552210807800293,1.0621581077575684,1.3386516571044922,1.2120237350463867,1.3351428508758545,1.3272712230682373,1.3289313316345215,4.3607823848724365,2.579437732696533,12.972614288330078,18.55408811569214,2.2937028408050537,2.7970471382141113,2.7456135749816895,2.9618709087371826,2.8277101516723633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,True,,True,1308,3597,,139,True,1367,Tests_passed,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,True,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,True,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,8187fa98e68a15e2044b13115cd3f5c2d74045d5e3051be7b2a03869ec44143b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,Merge_failed,13ef0312ef3799db7299625ce28bbaf6ef8868c2cf61fa768bd65f254ccf560a,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,26b21b3ca81915f28016d800fd4f0c3813ef2fe6d7974c73212d1b8edccbae25,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,042e97e12d816f90e916182635fda912628a8a0ccedfeb8e29b1df661684f1ee,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,1.0552210807800293,1.0621581077575684,1.3386516571044922,1.2120237350463867,1.3351428508758545,1.3272712230682373,1.3289313316345215,4.3607823848724365,2.579437732696533,12.972614288330078,18.55408811569214,2.2937028408050537,2.7970471382141113,2.7456135749816895,2.9618709087371826,2.8277101516723633,2.9140918254852295,2.767777919769287,2.9543395042419434,2.79526686668396,2.9764833450317383,3.003087043762207,3.07957124710083,3.9310014247894287,3.835834264755249,14.724291324615479,21.269376277923584,2.896538019180298,2.904756784439087,2.8805582523345947,2.8929882049560547,2.7427120208740234 diff --git a/results/combined/merges_timed/omnifaces/omnifaces.csv b/results/combined/merges_timed/omnifaces/omnifaces.csv index c6b0899f0e..534e2b0026 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -503,refs/heads/4.x,ccb06f87538a97e3bd9a8e73095a978efcafb7eb,9deef84288b08938b16b9ddd0ef0699dde8027e0,2b3b15be92a78784a06fc942214a202316c36a42,,True,True,Tests_passed,e84b0004155b3617a28d0425a5e5ba86afb87e6fa0271d7da11a45131b1b0ae8,True,9,27,146,2,True,Tests_passed,f0ec9e7775299ebf5531f6b5e1db33ae9a36c115ada5f0c788491ef57169c958,True,9,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,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_failed,c18a756ab796b59643ab57fc4aa80e211c0ad88d282598e2b1e4133182bc797e,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,df3043b2071105d3516f720d9a03b8ead4fcce3db9a1e6324cbf4f4e95d3bf4b,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,805a0e1e30ded8909dc3e3c4a09fed29105b618a64185f3531c0a7c4e40f02e9,Tests_failed,c18a756ab796b59643ab57fc4aa80e211c0ad88d282598e2b1e4133182bc797e,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,0.02371072769165039,0.05839896202087402,0.05513429641723633,0.03549599647521973,0.048812150955200195,0.04569864273071289,0.03294658660888672,0.18584656715393066,0.11171364784240723,0.5955595970153809,0.37861013412475586,0.03791403770446777,0.06506085395812988,0.06009411811828613,0.0858917236328125,0.0654149055480957 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +503,refs/heads/4.x,ccb06f87538a97e3bd9a8e73095a978efcafb7eb,9deef84288b08938b16b9ddd0ef0699dde8027e0,2b3b15be92a78784a06fc942214a202316c36a42,,True,True,Tests_passed,e84b0004155b3617a28d0425a5e5ba86afb87e6fa0271d7da11a45131b1b0ae8,True,9,27,146,2,True,Tests_passed,f0ec9e7775299ebf5531f6b5e1db33ae9a36c115ada5f0c788491ef57169c958,True,9,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,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_failed,c18a756ab796b59643ab57fc4aa80e211c0ad88d282598e2b1e4133182bc797e,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,df3043b2071105d3516f720d9a03b8ead4fcce3db9a1e6324cbf4f4e95d3bf4b,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,805a0e1e30ded8909dc3e3c4a09fed29105b618a64185f3531c0a7c4e40f02e9,Tests_failed,c18a756ab796b59643ab57fc4aa80e211c0ad88d282598e2b1e4133182bc797e,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,6113646f9fe9d8b397eacfc630766605536d1bbcd123ef31133f9f7b3be0fcc0,Tests_passed,005a479e6945e90bfe9cc488a84533358266a271434620642acab7a1f64225d6,0.02371072769165039,0.05839896202087402,0.05513429641723633,0.03549599647521973,0.048812150955200195,0.04569864273071289,0.03294658660888672,0.18584656715393066,0.11171364784240723,0.5955595970153809,0.37861013412475586,0.03791403770446777,0.06506085395812988,0.06009411811828613,0.0858917236328125,0.0654149055480957,0.08444499969482422,0.06515836715698242,0.06273341178894043,0.0972435474395752,0.0893862247467041,0.07137894630432129,0.09685039520263672,0.1404554843902588,0.09684109687805176,0.6803796291351318,0.46065187454223633,0.06456160545349121,0.06428813934326172,0.08664870262145996,0.08228540420532227,0.06399655342102051 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv index 7ecadf6f78..e5e437dca4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,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,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,2aaa4f208117900fafda1878e20216e4ed068d3dfa1b488cb07152da94f6b564,Tests_failed,f87e5db8eaca4d4141a3c0df09e0b526f4cab110c16ccd6db4bed2a82164061c,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,0.04436802864074707,0.05559659004211426,0.06967949867248535,0.04440021514892578,0.062482357025146484,0.09878873825073242,0.0744774341583252,0.20567059516906738,0.1406726837158203,0.7359962463378906,1.134589433670044,0.07877397537231445,0.10089540481567383,0.07784080505371094,0.10550451278686523,0.10604524612426758 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,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,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,2aaa4f208117900fafda1878e20216e4ed068d3dfa1b488cb07152da94f6b564,Tests_failed,f87e5db8eaca4d4141a3c0df09e0b526f4cab110c16ccd6db4bed2a82164061c,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,Tests_failed,8569a7e17683e55a8fb9fdb47fb31ac1c826db29adb28c0e712c5cf0cf4554e6,0.04436802864074707,0.05559659004211426,0.06967949867248535,0.04440021514892578,0.062482357025146484,0.09878873825073242,0.0744774341583252,0.20567059516906738,0.1406726837158203,0.7359962463378906,1.134589433670044,0.07877397537231445,0.10089540481567383,0.07784080505371094,0.10550451278686523,0.10604524612426758,0.10015392303466797,0.09541773796081543,0.10199308395385742,0.10319709777832031,0.1027674674987793,0.10208582878112793,0.10218620300292969,0.15476369857788086,0.12930035591125488,0.7700502872467041,1.22637939453125,0.09642863273620605,0.09669089317321777,0.0946342945098877,0.0955057144165039,0.09759378433227539 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv index b8126aca74..e5f888eae0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,True,171,723,10984,16,True,172,Tests_passed,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,True,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,True,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,298132f484081963456b2d3e967641a4f3483faf59957fb4a91e0807fe131156,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,Merge_failed,af41c6a4436412cde35e5c63179b3bb77ef6e0416a5414d62a16cc90e91e8a55,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a39374b4819c0f5dde2cdabe44732292c358bc91059b412553cf130278019ed1,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9c7d974a8f2acf0a32f6b26fa04ed39225a8fb07a507e2646e35cccf35416fd8,Merge_failed,4ee102eeff2a69ac6820dcde95d26eb63b9917115d45010dc9cf1db32a70b4e7,Merge_failed,0a90837ca8b77b15ae11de6c71c18ea2ba2896cdcc27ffd17cb5cddf98046f9c,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,0.053713321685791016,0.059839487075805664,0.06987595558166504,0.050627708435058594,0.05685877799987793,0.06803083419799805,0.052118778228759766,1.0805659294128418,0.9564487934112549,5.525013208389282,4.1083900928497314,0.19266223907470703,0.2690589427947998,0.19919443130493164,0.28805088996887207,0.2916417121887207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,True,171,723,10984,16,True,172,Tests_passed,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,True,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,True,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,298132f484081963456b2d3e967641a4f3483faf59957fb4a91e0807fe131156,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,Merge_failed,af41c6a4436412cde35e5c63179b3bb77ef6e0416a5414d62a16cc90e91e8a55,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a39374b4819c0f5dde2cdabe44732292c358bc91059b412553cf130278019ed1,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9c7d974a8f2acf0a32f6b26fa04ed39225a8fb07a507e2646e35cccf35416fd8,Merge_failed,4ee102eeff2a69ac6820dcde95d26eb63b9917115d45010dc9cf1db32a70b4e7,Merge_failed,0a90837ca8b77b15ae11de6c71c18ea2ba2896cdcc27ffd17cb5cddf98046f9c,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,9b683e1a041483a368ba63c2dad70ef21c9992f1763013a68b7139d99ab3ce31,Merge_failed,1072682c3f0e11f1f1e548b32bc5f1badec384dc0b2dd71873438cec3561ed1a,0.053713321685791016,0.059839487075805664,0.06987595558166504,0.050627708435058594,0.05685877799987793,0.06803083419799805,0.052118778228759766,1.0805659294128418,0.9564487934112549,5.525013208389282,4.1083900928497314,0.19266223907470703,0.2690589427947998,0.19919443130493164,0.28805088996887207,0.2916417121887207,0.2672231197357178,0.2671523094177246,0.27016162872314453,0.269639253616333,0.2658247947692871,0.27471923828125,0.26422548294067383,0.5284535884857178,0.67134690284729,5.602529048919678,4.368353843688965,0.26427531242370605,0.2682678699493408,0.27168965339660645,0.2653648853302002,0.270092248916626 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 14465e4b83..0f296963e9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,Tests_passed,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,True,7,263,6254,2,True,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,True,7,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,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Tests_failed,63055549bfb530abd2fe7148475ef8d0cbb4605abc0e36072a74266295073cd8,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,54cec7035a9563125581c76e887395910b93d7c1456c254d8d2ef397bec5036d,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,6dd0c4f546b21eea69587c993fe518b5f14a3c52606414078662c4ae62ff6f11,Tests_failed,2996784f4b19a6ebe9c50ec8860080d51c8c264e7e56feb018c34b90fe3d58c4,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,0.05508112907409668,0.049601078033447266,0.05783891677856445,0.016603469848632812,0.035987138748168945,0.05079936981201172,0.04881930351257324,0.17983222007751465,0.11239027976989746,0.47074341773986816,1.2465903759002686,0.04612398147583008,0.046695709228515625,0.04710793495178223,0.04826784133911133,0.050736427307128906 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,Tests_passed,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,True,7,263,6254,2,True,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,True,7,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,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Tests_failed,63055549bfb530abd2fe7148475ef8d0cbb4605abc0e36072a74266295073cd8,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,54cec7035a9563125581c76e887395910b93d7c1456c254d8d2ef397bec5036d,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,6dd0c4f546b21eea69587c993fe518b5f14a3c52606414078662c4ae62ff6f11,Tests_failed,2996784f4b19a6ebe9c50ec8860080d51c8c264e7e56feb018c34b90fe3d58c4,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,0.05508112907409668,0.049601078033447266,0.05783891677856445,0.016603469848632812,0.035987138748168945,0.05079936981201172,0.04881930351257324,0.17983222007751465,0.11239027976989746,0.47074341773986816,1.2465903759002686,0.04612398147583008,0.046695709228515625,0.04710793495178223,0.04826784133911133,0.050736427307128906,0.0474085807800293,0.04837775230407715,0.04785442352294922,0.04741477966308594,0.05018782615661621,0.048461198806762695,0.04957747459411621,0.0821685791015625,0.08763718605041504,0.4755251407623291,1.2960283756256104,0.046998023986816406,0.04729056358337402,0.04776620864868164,0.04959416389465332,0.04869222640991211 diff --git a/results/combined/merges_timed/onyxbits/raccoon.csv b/results/combined/merges_timed/onyxbits/raccoon.csv index 86fc983b81..157870a4cd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,True,11,56,1512,2,True,11,Tests_passed,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,True,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,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_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,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,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,0.09423017501831055,0.09484696388244629,0.12771892547607422,0.13708949089050293,0.1287825107574463,0.01283884048461914,0.12877130508422852,0.17831015586853027,0.12904644012451172,0.11092948913574219,0.4698493480682373,0.22890353202819824,0.22359585762023926,0.2311079502105713,0.17145776748657227,0.23579144477844238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,True,11,56,1512,2,True,11,Tests_passed,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,True,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,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_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,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,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,0.09423017501831055,0.09484696388244629,0.12771892547607422,0.13708949089050293,0.1287825107574463,0.01283884048461914,0.12877130508422852,0.17831015586853027,0.12904644012451172,0.11092948913574219,0.4698493480682373,0.22890353202819824,0.22359585762023926,0.2311079502105713,0.17145776748657227,0.23579144477844238,0.10085439682006836,0.2361922264099121,0.18158578872680664,0.2745239734649658,0.17677879333496094,0.27476930618286133,0.16995501518249512,0.3674581050872803,0.09096622467041016,0.2990243434906006,0.5545954704284668,0.24729585647583008,0.15767502784729004,0.2508656978607178,0.16975188255310059,0.24405312538146973 diff --git a/results/combined/merges_timed/openapitools/openapi-generator.csv b/results/combined/merges_timed/openapitools/openapi-generator.csv index 43becbeaf1..d0144f3315 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,True,True,True,93.0,164,3174.0,2,True,93,Tests_passed,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,True,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,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,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_failed,238b86d117337357ef985f03d3ab403369ea3dabc554f9e707b54d3b5d0378cf,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,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,468d4fac02faf144b4b39892f9878cd26ec54109f7f6912afadbf40f22e15ed9,Tests_failed,238b86d117337357ef985f03d3ab403369ea3dabc554f9e707b54d3b5d0378cf,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.04838991165161133,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.11614823341369629,2.380113363265991,1.2890796661376953,0.08242106437683105,0.12210464477539062,0.0790872573852539,0.12141704559326172,0.11974644660949707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,True,True,True,93.0,164,3174.0,2,True,93,Tests_passed,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,True,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,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,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_failed,238b86d117337357ef985f03d3ab403369ea3dabc554f9e707b54d3b5d0378cf,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,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,468d4fac02faf144b4b39892f9878cd26ec54109f7f6912afadbf40f22e15ed9,Tests_failed,238b86d117337357ef985f03d3ab403369ea3dabc554f9e707b54d3b5d0378cf,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.04838991165161133,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.11614823341369629,2.380113363265991,1.2890796661376953,0.08242106437683105,0.12210464477539062,0.0790872573852539,0.12141704559326172,0.11974644660949707,0.1095113754272461,0.10881304740905762,0.11672782897949219,0.11632895469665527,0.11987113952636719,0.1166229248046875,0.11665534973144531,0.17206788063049316,0.1504533290863037,2.2584590911865234,1.3609659671783447,0.11269140243530273,0.10961532592773438,0.11050558090209961,0.10808730125427246,0.10738253593444824 diff --git a/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv b/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv index 21e10ccb48..158101b48d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,True,18,58,270,3,True,18,Tests_passed,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,True,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,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,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Tests_failed,3060d3d1793b8fa8a4f8fd4669abf07166f5823c99e659224039da94e74a2419,Merge_failed,48f975d7d63a0b02691840624c5e9b3077f0f5dc48036e5a83e32e0a740e4318,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,5249e6bbc338e3b5ddd7994c311120b194ed937cb76f287f1e90a8c1fc6b5bef,Tests_failed,a6889db9a330ccd055f4134f814f91e08be14ea4275375c10025e0a0389ab205,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,0.04179716110229492,0.04239606857299805,0.009165048599243164,0.013837814331054688,0.03812813758850098,0.040461063385009766,0.032958984375,0.21674275398254395,0.15745091438293457,1.1854372024536133,0.3899686336517334,0.05272173881530762,0.07044124603271484,0.05115556716918945,0.07075071334838867,0.06914138793945312 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,True,18,58,270,3,True,18,Tests_passed,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,True,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,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,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Tests_failed,3060d3d1793b8fa8a4f8fd4669abf07166f5823c99e659224039da94e74a2419,Merge_failed,48f975d7d63a0b02691840624c5e9b3077f0f5dc48036e5a83e32e0a740e4318,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,5249e6bbc338e3b5ddd7994c311120b194ed937cb76f287f1e90a8c1fc6b5bef,Tests_failed,a6889db9a330ccd055f4134f814f91e08be14ea4275375c10025e0a0389ab205,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,Tests_passed,afaa6d8e8a7a12012fb27820963630cc79c227e0915d89a1309a3a0f3bdbfd39,0.04179716110229492,0.04239606857299805,0.009165048599243164,0.013837814331054688,0.03812813758850098,0.040461063385009766,0.032958984375,0.21674275398254395,0.15745091438293457,1.1854372024536133,0.3899686336517334,0.05272173881530762,0.07044124603271484,0.05115556716918945,0.07075071334838867,0.06914138793945312,0.06786775588989258,0.06753230094909668,0.06715106964111328,0.06679058074951172,0.06643509864807129,0.0664513111114502,0.06756019592285156,0.11247873306274414,0.12984204292297363,1.2653393745422363,0.4641141891479492,0.06749606132507324,0.0689234733581543,0.06758642196655273,0.06921243667602539,0.06858015060424805 diff --git a/results/combined/merges_timed/openhab/jmdns.csv b/results/combined/merges_timed/openhab/jmdns.csv index 353d793281..ddb50baa50 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,True,24,105,684,80,True,90,Tests_passed,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,True,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,True,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,21b12506ca022a09c217c02d9f1824db5c12c37b09754426a64b257686ebe173,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,Merge_failed,80713ab88e94114d1225552c1ce1d01db5ba5163282ddd4265ea296c04f3e6a5,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,9509c5b612ed484b3a461542336a00877e95305abd6e2cb9eaa26c6c9ecc47dd,Merge_failed,2a5abd9fe673ccbfa801da754c71db64642760e9847cd10b7bc04e6d30ae926d,Merge_failed,2a5abd9fe673ccbfa801da754c71db64642760e9847cd10b7bc04e6d30ae926d,Merge_failed,4f1849be5b94dc2b702e6ba4a0e115416f9c2b44f0aa5f3cd9a2eae4566ed32e,Merge_failed,37493f6fdfd83e476a593afa1e5e6fe174802f9e07f5d858d3784b2740e34038,Merge_failed,a57848052a49ccd5a2f31bae16a6a0761745f17e64df78865bae853a8baa6254,Merge_failed,55d33703ededbac1d33a45f1f121cd077e9b7eac43906218da5a1bf40ca54859,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,0.06467890739440918,0.05191206932067871,0.06504368782043457,0.049094200134277344,0.04583430290222168,0.08580374717712402,0.0714712142944336,0.9633195400238037,0.8730738162994385,12.172288417816162,1.43453049659729,0.2058570384979248,0.3063080310821533,0.2207775115966797,0.3614082336425781,0.32100892066955566 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,True,24,105,684,80,True,90,Tests_passed,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,True,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,True,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,21b12506ca022a09c217c02d9f1824db5c12c37b09754426a64b257686ebe173,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,Merge_failed,80713ab88e94114d1225552c1ce1d01db5ba5163282ddd4265ea296c04f3e6a5,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,9509c5b612ed484b3a461542336a00877e95305abd6e2cb9eaa26c6c9ecc47dd,Merge_failed,2a5abd9fe673ccbfa801da754c71db64642760e9847cd10b7bc04e6d30ae926d,Merge_failed,2a5abd9fe673ccbfa801da754c71db64642760e9847cd10b7bc04e6d30ae926d,Merge_failed,4f1849be5b94dc2b702e6ba4a0e115416f9c2b44f0aa5f3cd9a2eae4566ed32e,Merge_failed,37493f6fdfd83e476a593afa1e5e6fe174802f9e07f5d858d3784b2740e34038,Merge_failed,a57848052a49ccd5a2f31bae16a6a0761745f17e64df78865bae853a8baa6254,Merge_failed,55d33703ededbac1d33a45f1f121cd077e9b7eac43906218da5a1bf40ca54859,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,46f21908d3a66f74fc0f4b429b928507ea2097755b6569fc0753c9bda9a6c108,Merge_failed,060d09ab0ad2287677575cafaa3a835834bed6e355b250eb714d4f8e99376b4f,0.06467890739440918,0.05191206932067871,0.06504368782043457,0.049094200134277344,0.04583430290222168,0.08580374717712402,0.0714712142944336,0.9633195400238037,0.8730738162994385,12.172288417816162,1.43453049659729,0.2058570384979248,0.3063080310821533,0.2207775115966797,0.3614082336425781,0.32100892066955566,0.3471801280975342,0.3312993049621582,0.35855650901794434,0.3638021945953369,0.3740861415863037,0.43894481658935547,0.3772568702697754,0.6530091762542725,0.799487829208374,13.989778757095337,1.9226551055908203,0.30293703079223633,0.357529878616333,0.32747697830200195,0.3510422706604004,0.33928728103637695 diff --git a/results/combined/merges_timed/openhft/chronicle-bytes.csv b/results/combined/merges_timed/openhft/chronicle-bytes.csv index 8bbd24cee2..bc030b88b1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,True,67,250,5935,3,True,67,Tests_passed,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,True,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,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,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_failed,4e5636abe784f3bcf0eaa39b13272c1519117a0115a2c9e24680606e23e712c3,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,c3cbc8a9aee7d3064cdf4e66f797b13bcb44e6c309a6df107b3af4a34ebb38a1,Tests_failed,0030012c1a83c9983cf9a7f9392942a940ac4d22e1e5c8489e366cdb720d440b,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,0.029448270797729492,0.028345823287963867,0.03327131271362305,0.04154801368713379,0.0331418514251709,0.0329279899597168,0.032402753829956055,0.08248543739318848,0.1366715431213379,2.045332908630371,1.8859405517578125,0.05645179748535156,0.1257779598236084,0.0671231746673584,0.11426901817321777,0.11081409454345703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,True,67,250,5935,3,True,67,Tests_passed,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,True,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,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,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_failed,4e5636abe784f3bcf0eaa39b13272c1519117a0115a2c9e24680606e23e712c3,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_failed,c3cbc8a9aee7d3064cdf4e66f797b13bcb44e6c309a6df107b3af4a34ebb38a1,Tests_failed,0030012c1a83c9983cf9a7f9392942a940ac4d22e1e5c8489e366cdb720d440b,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,Tests_passed,4de253ed3ebc741ede3ffc8e9d2ea761d984ab654bf471f96b7e34470af9fe93,0.029448270797729492,0.028345823287963867,0.03327131271362305,0.04154801368713379,0.0331418514251709,0.0329279899597168,0.032402753829956055,0.08248543739318848,0.1366715431213379,2.045332908630371,1.8859405517578125,0.05645179748535156,0.1257779598236084,0.0671231746673584,0.11426901817321777,0.11081409454345703,0.1258842945098877,0.12235307693481445,0.11108636856079102,0.12695550918579102,0.12937259674072266,0.10941243171691895,0.11441993713378906,0.1995987892150879,0.1650698184967041,2.2426860332489014,2.006887674331665,0.11377787590026855,0.12764549255371094,0.11180758476257324,0.11061406135559082,0.12370491027832031 diff --git a/results/combined/merges_timed/openhft/chronicle-network.csv b/results/combined/merges_timed/openhft/chronicle-network.csv index 314692ec72..585c817a6c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,True,True,True,56,315,1682,3,True,56,Tests_passed,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,True,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,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,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,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,35dbb74cd57a237fee3a6273853b0773cb1888cbe65d7a88823cd998a0adb6f1,Tests_failed,33b92c426061591f27cf320df1024c13691be23ad9e1f42e4998c303cef8b225,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,0.021095991134643555,0.022266149520874023,0.023018836975097656,0.03144097328186035,0.02350306510925293,0.02289891242980957,0.0227813720703125,0.06618690490722656,0.12950968742370605,1.2508831024169922,1.0093505382537842,0.05228090286254883,0.10024070739746094,0.05774807929992676,0.09014606475830078,0.10165262222290039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,True,True,True,56,315,1682,3,True,56,Tests_passed,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,True,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,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,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,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,35dbb74cd57a237fee3a6273853b0773cb1888cbe65d7a88823cd998a0adb6f1,Tests_failed,33b92c426061591f27cf320df1024c13691be23ad9e1f42e4998c303cef8b225,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,0.021095991134643555,0.022266149520874023,0.023018836975097656,0.03144097328186035,0.02350306510925293,0.02289891242980957,0.0227813720703125,0.06618690490722656,0.12950968742370605,1.2508831024169922,1.0093505382537842,0.05228090286254883,0.10024070739746094,0.05774807929992676,0.09014606475830078,0.10165262222290039,0.0995786190032959,0.10082721710205078,0.09725308418273926,0.10367274284362793,0.10356473922729492,0.10494112968444824,0.1001284122467041,0.15456247329711914,0.15911316871643066,1.503904104232788,1.1996982097625732,0.10107231140136719,0.10053372383117676,0.10241103172302246,0.09914040565490723,0.10019350051879883 diff --git a/results/combined/merges_timed/openhft/chronicle-threads.csv b/results/combined/merges_timed/openhft/chronicle-threads.csv index b5d7edb7f2..6d12e86866 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,True,34,57,268,2,True,34,Tests_passed,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,True,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,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,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,366d6129b040250bde2091fda83a8d367893f22ae6e3dbfa117b6e36f980b64a,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,0.011560916900634766,0.011725425720214844,0.011933565139770508,0.018487930297851562,0.011925458908081055,0.01192617416381836,0.01172780990600586,0.037741661071777344,0.06698322296142578,0.8426735401153564,0.6530659198760986,0.034722328186035156,0.06042599678039551,0.03550076484680176,0.06118917465209961,0.059798240661621094 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,True,34,57,268,2,True,34,Tests_passed,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,True,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,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,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,366d6129b040250bde2091fda83a8d367893f22ae6e3dbfa117b6e36f980b64a,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,Tests_passed,3d0bebf2fc3c9c1be3b4adb0ff8ce7ecfec2019b1e7dfd74c1350b7c3d088d42,0.011560916900634766,0.011725425720214844,0.011933565139770508,0.018487930297851562,0.011925458908081055,0.01192617416381836,0.01172780990600586,0.037741661071777344,0.06698322296142578,0.8426735401153564,0.6530659198760986,0.034722328186035156,0.06042599678039551,0.03550076484680176,0.06118917465209961,0.059798240661621094,0.06200695037841797,0.061595916748046875,0.061026573181152344,0.060273170471191406,0.0609743595123291,0.06070208549499512,0.06184649467468262,0.09337329864501953,0.09245014190673828,0.9650671482086182,0.6855733394622803,0.060257673263549805,0.06168174743652344,0.06126737594604492,0.06179094314575195,0.05952954292297363 diff --git a/results/combined/merges_timed/openhft/zero-allocation-hashing.csv b/results/combined/merges_timed/openhft/zero-allocation-hashing.csv index 8329a99937..7b573495ec 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,True,6,23,140,6,True,9,Tests_passed,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,True,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,True,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,ff15de3d3738dd369ee13b1e2314d09b5ecdba227c41565d881a91d252346980,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,0.012487411499023438,0.012239217758178711,0.012381315231323242,0.017843008041381836,0.012759923934936523,0.012563705444335938,0.012338876724243164,0.05225539207458496,0.12961888313293457,1.8859987258911133,0.4694325923919678,0.04909253120422363,0.0529177188873291,0.0527341365814209,0.05324053764343262,0.05308890342712402 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,True,6,23,140,6,True,9,Tests_passed,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,True,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,True,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,ff15de3d3738dd369ee13b1e2314d09b5ecdba227c41565d881a91d252346980,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,0.012487411499023438,0.012239217758178711,0.012381315231323242,0.017843008041381836,0.012759923934936523,0.012563705444335938,0.012338876724243164,0.05225539207458496,0.12961888313293457,1.8859987258911133,0.4694325923919678,0.04909253120422363,0.0529177188873291,0.0527341365814209,0.05324053764343262,0.05308890342712402,0.05032944679260254,0.05106782913208008,0.05015873908996582,0.051973581314086914,0.05086350440979004,0.05104327201843262,0.051106929779052734,0.10056686401367188,0.11417913436889648,1.7700920104980469,0.5343632698059082,0.05201292037963867,0.0501706600189209,0.05114006996154785,0.05081009864807129,0.050431251525878906 diff --git a/results/combined/merges_timed/openmicroscopy/bioformats.csv b/results/combined/merges_timed/openmicroscopy/bioformats.csv index 49aa608fa0..420ba853dc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3992,refs/remotes/origin/pull/3032,93f990104b3c1fb1ee1ab2a26a0f078c09b5822a,aeb68fb7f320c6f1ca9d0fafac2e6ebfc86f0a64,07b804962bea206361e1ab1a8e56874cf8c68496,,True,True,True,126,758,6919.0,2,True,126,Tests_passed,fc672c93bcc8a2117ac0f906dbf9f2595ee7809f9530400311470d22d7589c26,True,Tests_passed,01bf3aad3d4d9de585e7a55113b203c837083af67645fdbc3da03627df38cc04,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,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,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_failed,35738ad4ec3e76fbb9023ac62c95a104fcb6bad145b371e0c498749af298c59a,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,0.04167342185974121,0.0418848991394043,0.05496978759765625,0.06375312805175781,0.05386519432067871,0.05509042739868164,0.05464887619018555,0.09476923942565918,0.09656882286071777,0.04604172706604004,5.009494066238403,0.10725617408752441,0.1326122283935547,0.11127853393554688,0.13654088973999023,0.13557076454162598 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3992,refs/remotes/origin/pull/3032,93f990104b3c1fb1ee1ab2a26a0f078c09b5822a,aeb68fb7f320c6f1ca9d0fafac2e6ebfc86f0a64,07b804962bea206361e1ab1a8e56874cf8c68496,,True,True,True,126,758,6919.0,2,True,126,Tests_passed,fc672c93bcc8a2117ac0f906dbf9f2595ee7809f9530400311470d22d7589c26,True,Tests_passed,01bf3aad3d4d9de585e7a55113b203c837083af67645fdbc3da03627df38cc04,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,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,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_failed,35738ad4ec3e76fbb9023ac62c95a104fcb6bad145b371e0c498749af298c59a,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,0.04167342185974121,0.0418848991394043,0.05496978759765625,0.06375312805175781,0.05386519432067871,0.05509042739868164,0.05464887619018555,0.09476923942565918,0.09656882286071777,0.04604172706604004,5.009494066238403,0.10725617408752441,0.1326122283935547,0.11127853393554688,0.13654088973999023,0.13557076454162598,0.13112568855285645,0.12531185150146484,0.14212346076965332,0.14148426055908203,0.14183950424194336,0.14120006561279297,0.14011859893798828,0.19115996360778809,0.17412233352661133,0.15223956108093262,4.242527484893799,0.12025070190429688,0.12849974632263184,0.12241077423095703,0.12444877624511719,0.13174796104431152 diff --git a/results/combined/merges_timed/openpnp/openpnp.csv b/results/combined/merges_timed/openpnp/openpnp.csv index 73a543baac..c90512c81e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -468,refs/heads/develop,3cc5b458a4a78bb580e90cd510be43c69f79226e,f2af033914781f4b84f6c13c5d8c6ddfcdb24a29,5cd215a0aa1117758f13e7f850a12c6e648eef37,,True,False,Tests_passed,1a299c2cc11e553239f49380cd306b18668691dea04a96961404fe237a06a275,True,2,2,4.0,2,True,Tests_passed,58972a804488066374207fe385820067eae6c0ae39f15cb1383fe0ff7b10d3ab,True,2,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,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,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,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,6e4f55f3d563f5b9ed33ba76efba5707686d40bb464f8c1f61984144137bc326,Tests_failed,7823b421a102e3245b5433368efae24acaa1c9c159ba516b9e5f4e6a70817597,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,0.04652905464172363,0.038138389587402344,0.04893016815185547,0.02006697654724121,0.041185617446899414,0.026285648345947266,0.0523221492767334,0.17014122009277344,0.11679816246032715,1.2760038375854492,0.37665438652038574,0.03778576850891113,0.06509709358215332,0.0371401309967041,0.06371736526489258,0.06172943115234375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +468,refs/heads/develop,3cc5b458a4a78bb580e90cd510be43c69f79226e,f2af033914781f4b84f6c13c5d8c6ddfcdb24a29,5cd215a0aa1117758f13e7f850a12c6e648eef37,,True,False,Tests_passed,1a299c2cc11e553239f49380cd306b18668691dea04a96961404fe237a06a275,True,2,2,4.0,2,True,Tests_passed,58972a804488066374207fe385820067eae6c0ae39f15cb1383fe0ff7b10d3ab,True,2,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,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,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,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,6e4f55f3d563f5b9ed33ba76efba5707686d40bb464f8c1f61984144137bc326,Tests_failed,7823b421a102e3245b5433368efae24acaa1c9c159ba516b9e5f4e6a70817597,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,0.04652905464172363,0.038138389587402344,0.04893016815185547,0.02006697654724121,0.041185617446899414,0.026285648345947266,0.0523221492767334,0.17014122009277344,0.11679816246032715,1.2760038375854492,0.37665438652038574,0.03778576850891113,0.06509709358215332,0.0371401309967041,0.06371736526489258,0.06172943115234375,0.059317588806152344,0.05922269821166992,0.062439680099487305,0.06330728530883789,0.06308269500732422,0.06398773193359375,0.06368637084960938,0.09660887718200684,0.09167337417602539,1.2599282264709473,0.41530442237854004,0.06096005439758301,0.06193709373474121,0.0628366470336914,0.06233787536621094,0.06300234794616699 diff --git a/results/combined/merges_timed/openrefine/openrefine.csv b/results/combined/merges_timed/openrefine/openrefine.csv index 40c4ee094d..722daf933a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78.0,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,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_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,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,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.04171133041381836,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.10298490524291992,0.07673406600952148,9.559029340744019,0.07256245613098145,0.10091805458068848,0.0719447135925293,0.09941720962524414,0.10069012641906738 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78.0,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,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_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,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,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.04171133041381836,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.10298490524291992,0.07673406600952148,9.559029340744019,0.07256245613098145,0.10091805458068848,0.0719447135925293,0.09941720962524414,0.10069012641906738,0.09463119506835938,0.09325242042541504,0.10229206085205078,0.10196471214294434,0.10673141479492188,0.1047203540802002,0.1013784408569336,0.14334583282470703,0.134505033493042,0.11292314529418945,10.048802614212036,0.0932776927947998,0.09418892860412598,0.09309601783752441,0.0918874740600586,0.0975489616394043 diff --git a/results/combined/merges_timed/openskynetwork/java-adsb.csv b/results/combined/merges_timed/openskynetwork/java-adsb.csv index 9f3eca8682..f174acf41d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,True,True,Tests_passed,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,True,11,43,355,2,True,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,True,12,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,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,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,151b85327ee8bd6ad8897a7e3e345f87d002cb5fe90b36c4189da904aabdf9e0,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,0.04639935493469238,0.039641618728637695,0.05052590370178223,0.01591348648071289,0.0517575740814209,0.04867887496948242,0.04800248146057129,0.2120685577392578,0.17331218719482422,1.058089256286621,0.5118160247802734,0.031255483627319336,0.05553412437438965,0.031140804290771484,0.05498242378234863,0.053287506103515625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,True,True,Tests_passed,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,True,11,43,355,2,True,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,True,12,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,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,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,151b85327ee8bd6ad8897a7e3e345f87d002cb5fe90b36c4189da904aabdf9e0,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,0.04639935493469238,0.039641618728637695,0.05052590370178223,0.01591348648071289,0.0517575740814209,0.04867887496948242,0.04800248146057129,0.2120685577392578,0.17331218719482422,1.058089256286621,0.5118160247802734,0.031255483627319336,0.05553412437438965,0.031140804290771484,0.05498242378234863,0.053287506103515625,0.0552976131439209,0.0543668270111084,0.05630016326904297,0.05644559860229492,0.05685687065124512,0.05619168281555176,0.056130170822143555,0.0925290584564209,0.1110982894897461,1.1889891624450684,0.5915205478668213,0.05278158187866211,0.055357933044433594,0.054360151290893555,0.05602884292602539,0.054615020751953125 diff --git a/results/combined/merges_timed/opentosca/container.csv b/results/combined/merges_timed/opentosca/container.csv index ef079943d5..f6f49ed843 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -255,refs/remotes/origin/pull/252,294305d0a87dbda54b1dca1962fe45988851a096,bd7ecb1c7af4d5bfbbc825493497fb6885f8eca1,e3e986b86de0061e502da0c5e31b645386f3d813,,True,True,Tests_passed,90c0f8554c337383b6dc066894b5b73fbfe9272ca56ae84e4f7d756557554a27,True,270,1324,22262,3,True,Tests_passed,3f5f3a7741e5cc1116ce0ec0c40ca45df77af9c46f7967d357a78a9fc376dcc9,True,270,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,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,Merge_timedout,,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,0.07596325874328613,0.06953811645507812,0.09201359748840332,0.0871891975402832,0.08815169334411621,0.08267688751220703,0.09023332595825195,0.2190854549407959,0.20937061309814453,0.09394526481628418,-1.0,0.13522601127624512,0.19181489944458008,0.1320035457611084,0.18879246711730957,0.18741345405578613 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +255,refs/remotes/origin/pull/252,294305d0a87dbda54b1dca1962fe45988851a096,bd7ecb1c7af4d5bfbbc825493497fb6885f8eca1,e3e986b86de0061e502da0c5e31b645386f3d813,,True,True,Tests_passed,90c0f8554c337383b6dc066894b5b73fbfe9272ca56ae84e4f7d756557554a27,True,270,1324,22262,3,True,Tests_passed,3f5f3a7741e5cc1116ce0ec0c40ca45df77af9c46f7967d357a78a9fc376dcc9,True,270,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,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,Merge_timedout,,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,0.07596325874328613,0.06953811645507812,0.09201359748840332,0.0871891975402832,0.08815169334411621,0.08267688751220703,0.09023332595825195,0.2190854549407959,0.20937061309814453,0.09394526481628418,-1.0,0.13522601127624512,0.19181489944458008,0.1320035457611084,0.18879246711730957,0.18741345405578613,0.18703937530517578,0.18798613548278809,0.19570279121398926,0.20304584503173828,0.20140624046325684,0.1918926239013672,0.1954669952392578,0.29051661491394043,0.26255249977111816,0.2232670783996582,-1.0,0.18549871444702148,0.18758630752563477,0.19555282592773438,0.18724465370178223,0.19386744499206543 diff --git a/results/combined/merges_timed/openzipkin/zipkin.csv b/results/combined/merges_timed/openzipkin/zipkin.csv index 2c1f2e07ef..d98a305246 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,False,Tests_passed,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,True,2,2,3,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,True,3,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_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,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,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.020254135131835938,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.07423019409179688,0.028954744338989258,0.3449990749359131,0.03925919532775879,0.06377768516540527,0.03776693344116211,0.06469225883483887,0.06477189064025879 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,False,Tests_passed,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,True,2,2,3,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,True,3,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_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,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,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.020254135131835938,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.07423019409179688,0.028954744338989258,0.3449990749359131,0.03925919532775879,0.06377768516540527,0.03776693344116211,0.06469225883483887,0.06477189064025879,0.059746503829956055,0.0612950325012207,0.06162595748901367,0.06153154373168945,0.062447309494018555,0.06380343437194824,0.06194186210632324,0.09741783142089844,0.09226036071777344,0.07440447807312012,0.38285255432128906,0.06045818328857422,0.06042075157165527,0.06017565727233887,0.06271553039550781,0.05980658531188965 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 446ad3b461..b6a03825f6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,True,False,True,2,2,4,2,True,2,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,True,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,True,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,1ffbdd50a6bd0e42dc6937192d055a0b09fb70b2cfb1ad6cc52e7a69ae5eebaa,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,baaff9d64242940afb8dc0a257b4942e057aa029143694374d82ab75f23cd38b,Tests_failed,47ab1130b9fe951f3e006ec15f536a3df5bbab4b32de2b19d86898034899f55c,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,0.036847591400146484,0.037848472595214844,0.039073944091796875,0.02147817611694336,0.05757331848144531,0.0389862060546875,0.03901195526123047,0.15761876106262207,0.11438775062561035,0.7093546390533447,0.27552056312561035,0.04413914680480957,0.04610729217529297,0.0458979606628418,0.06337451934814453,0.06360435485839844 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,True,False,True,2,2,4,2,True,2,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,True,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,True,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,1ffbdd50a6bd0e42dc6937192d055a0b09fb70b2cfb1ad6cc52e7a69ae5eebaa,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,baaff9d64242940afb8dc0a257b4942e057aa029143694374d82ab75f23cd38b,Tests_failed,47ab1130b9fe951f3e006ec15f536a3df5bbab4b32de2b19d86898034899f55c,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,4bc1b1fe32bd4461c51b6f666e2098bc6a30be46b75331094ffe5456e2f64586,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,0.036847591400146484,0.037848472595214844,0.039073944091796875,0.02147817611694336,0.05757331848144531,0.0389862060546875,0.03901195526123047,0.15761876106262207,0.11438775062561035,0.7093546390533447,0.27552056312561035,0.04413914680480957,0.04610729217529297,0.0458979606628418,0.06337451934814453,0.06360435485839844,0.05886268615722656,0.05933046340942383,0.0596005916595459,0.06271052360534668,0.060248374938964844,0.058129072189331055,0.059293270111083984,0.0935506820678711,0.10110902786254883,0.7180192470550537,0.33826756477355957,0.05933260917663574,0.059522151947021484,0.06161189079284668,0.061691999435424805,0.05877494812011719 diff --git a/results/combined/merges_timed/optimaize/language-detector.csv b/results/combined/merges_timed/optimaize/language-detector.csv index be06660eda..2b6f3f3fe9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,True,3,7,21,2,True,3,Tests_passed,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,True,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,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,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,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,f90c1fecf78c7c97ac1be61f3e257f55b88f0468b955b84b8271425bfe051436,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,0.044165849685668945,0.02484130859375,0.010926485061645508,0.05500340461730957,0.03673148155212402,0.01009368896484375,0.009894847869873047,0.14533305168151855,0.09202194213867188,0.8287889957427979,0.3229939937591553,0.09957647323608398,0.12293696403503418,0.030469894409179688,0.1249840259552002,0.10352635383605957 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,True,3,7,21,2,True,3,Tests_passed,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,True,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,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,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,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,f90c1fecf78c7c97ac1be61f3e257f55b88f0468b955b84b8271425bfe051436,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,0.044165849685668945,0.02484130859375,0.010926485061645508,0.05500340461730957,0.03673148155212402,0.01009368896484375,0.009894847869873047,0.14533305168151855,0.09202194213867188,0.8287889957427979,0.3229939937591553,0.09957647323608398,0.12293696403503418,0.030469894409179688,0.1249840259552002,0.10352635383605957,0.11747479438781738,0.1210622787475586,0.13019013404846191,0.13901281356811523,0.13358616828918457,0.13753890991210938,0.054721832275390625,0.18237066268920898,0.15938830375671387,1.066697597503662,0.45786213874816895,0.11814713478088379,0.12428474426269531,0.05457592010498047,0.11865115165710449,0.12318062782287598 diff --git a/results/combined/merges_timed/orctom/was-maven-plugin.csv b/results/combined/merges_timed/orctom/was-maven-plugin.csv index 64f98b51f8..6ff92bed92 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,True,6,10,46,3,True,7,Tests_passed,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,True,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,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,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,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,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,ea47a1e9519db8990f739a53a3c8502e8f61ffe068f180b04d41fe721434786a,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,0.042169809341430664,0.037450313568115234,0.04598641395568848,0.015639543533325195,0.042571067810058594,0.044773101806640625,0.04275798797607422,0.16681814193725586,0.11370038986206055,0.6157257556915283,0.28648829460144043,0.03182268142700195,0.05517721176147461,0.03235483169555664,0.05538821220397949,0.05536293983459473 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,True,6,10,46,3,True,7,Tests_passed,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,True,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,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,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,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,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,ea47a1e9519db8990f739a53a3c8502e8f61ffe068f180b04d41fe721434786a,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,0.042169809341430664,0.037450313568115234,0.04598641395568848,0.015639543533325195,0.042571067810058594,0.044773101806640625,0.04275798797607422,0.16681814193725586,0.11370038986206055,0.6157257556915283,0.28648829460144043,0.03182268142700195,0.05517721176147461,0.03235483169555664,0.05538821220397949,0.05536293983459473,0.055773258209228516,0.05552959442138672,0.05587482452392578,0.056756019592285156,0.056687355041503906,0.05717182159423828,0.05669832229614258,0.08926725387573242,0.09066534042358398,0.7234594821929932,0.33888840675354004,0.05631279945373535,0.05568671226501465,0.05552554130554199,0.05512809753417969,0.05661177635192871 diff --git a/results/combined/merges_timed/orien/bean-matchers.csv b/results/combined/merges_timed/orien/bean-matchers.csv index 058c06133d..5e7ee826ee 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,Tests_passed,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,True,104,531,7572,2,True,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,True,104,True,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,82ade3854741c5793fe8855d75445b78b7e86663824889fa0a976033690a71a8,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Tests_failed,5a9d0ab01fb697985acb74aad9aef48106a294a310e1ac8e37b90c59aecaa1f5,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,f7ef3ee0e53b0866babfb627151cb905c060d857d4f88aae44d0b75e5a32c518,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,712b6c9ca2891cc8977b1f7e0ae8510122df9a4b13f4303b9b122c902597cf76,Tests_failed,85d347cfba4daadf64be0413d5b2b7fa7a7e5b117e1eb9c0b14a8de645cd2a18,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,0.05687856674194336,0.05084562301635742,0.05061745643615723,0.021062612533569336,0.056932687759399414,0.05561542510986328,0.049146413803100586,0.17970681190490723,0.12222504615783691,0.6077532768249512,0.6399979591369629,0.04835796356201172,0.04909873008728027,0.04883623123168945,0.05055403709411621,0.06450653076171875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,Tests_passed,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,True,104,531,7572,2,True,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,True,104,True,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,82ade3854741c5793fe8855d75445b78b7e86663824889fa0a976033690a71a8,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Tests_failed,5a9d0ab01fb697985acb74aad9aef48106a294a310e1ac8e37b90c59aecaa1f5,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,f7ef3ee0e53b0866babfb627151cb905c060d857d4f88aae44d0b75e5a32c518,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,712b6c9ca2891cc8977b1f7e0ae8510122df9a4b13f4303b9b122c902597cf76,Tests_failed,85d347cfba4daadf64be0413d5b2b7fa7a7e5b117e1eb9c0b14a8de645cd2a18,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Merge_failed,0080107a5528bea210992b2b0394d57ab31bf42b07c182492893d918c456349c,Tests_passed,29b3eb6bd0ff1bd4367d9e051fc3cdc7ac23565c1ce3788f0a0418e0121ea462,0.05687856674194336,0.05084562301635742,0.05061745643615723,0.021062612533569336,0.056932687759399414,0.05561542510986328,0.049146413803100586,0.17970681190490723,0.12222504615783691,0.6077532768249512,0.6399979591369629,0.04835796356201172,0.04909873008728027,0.04883623123168945,0.05055403709411621,0.06450653076171875,0.04944634437561035,0.06015801429748535,0.04863238334655762,0.05968761444091797,0.049454450607299805,0.05177640914916992,0.04982614517211914,0.08507704734802246,0.08924746513366699,0.6595427989959717,0.731212854385376,0.04733133316040039,0.04872274398803711,0.04966878890991211,0.04911994934082031,0.05865621566772461 diff --git a/results/combined/merges_timed/orientechnologies/orientdb-etl.csv b/results/combined/merges_timed/orientechnologies/orientdb-etl.csv index 401ccda7b4..215dd523ac 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,True,54,239,1446,6,True,54,Tests_passed,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,True,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,True,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,84259afd6e1fcf518889a029081782fef076cc82dd3ef04413266db1dae47516,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,Merge_failed,5de0fdc6c9f2d6e51c213a07da2b3813492af71e97b363f7ac201e94119fd88a,Merge_failed,18c4232f46dacba599c7c8591d843bf9e002587b15896e07d12fca9c1ed860b9,Merge_failed,a1e9659e9f7a352a397fa466deb8834f44a07a60c36eb2dd053bab5f875aa4b7,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,8e800895cf0e75da3dc2c3896a9c071e7730f7ea4dae99b2c273ba32c2341a55,Merge_failed,f29b3225f30156eaf641263a7ee602c3668684af3db4e1520fee4ffd05a0147e,Merge_failed,f29b3225f30156eaf641263a7ee602c3668684af3db4e1520fee4ffd05a0147e,Merge_failed,019fd08e337cac896d0be711ba58d28292a5e1fbd76c9711028bde0308cf13fc,Merge_failed,8514bbd4c79a8480f6068d47be5a928ef91f4c2382bc08a5368b718c0d4b1f01,Merge_failed,99bdfffef8e9d3354d1da006ffa22ac80129d6d9451a204528ae15d139a81da8,Merge_failed,9feac2af3b2b59bf4888a8546638dfb54e620e1b9e2855f3a13e446a528ba4da,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,0.013128280639648438,0.013209342956542969,0.012944221496582031,0.021321773529052734,0.013128042221069336,0.013079404830932617,0.013139963150024414,0.08809709548950195,0.30446934700012207,3.7994775772094727,3.797261953353882,0.07440781593322754,0.12430071830749512,0.0730886459350586,0.12691664695739746,0.12436413764953613 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,True,54,239,1446,6,True,54,Tests_passed,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,True,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,True,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,84259afd6e1fcf518889a029081782fef076cc82dd3ef04413266db1dae47516,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,Merge_failed,5de0fdc6c9f2d6e51c213a07da2b3813492af71e97b363f7ac201e94119fd88a,Merge_failed,18c4232f46dacba599c7c8591d843bf9e002587b15896e07d12fca9c1ed860b9,Merge_failed,a1e9659e9f7a352a397fa466deb8834f44a07a60c36eb2dd053bab5f875aa4b7,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,8e800895cf0e75da3dc2c3896a9c071e7730f7ea4dae99b2c273ba32c2341a55,Merge_failed,f29b3225f30156eaf641263a7ee602c3668684af3db4e1520fee4ffd05a0147e,Merge_failed,f29b3225f30156eaf641263a7ee602c3668684af3db4e1520fee4ffd05a0147e,Merge_failed,019fd08e337cac896d0be711ba58d28292a5e1fbd76c9711028bde0308cf13fc,Merge_failed,8514bbd4c79a8480f6068d47be5a928ef91f4c2382bc08a5368b718c0d4b1f01,Merge_failed,99bdfffef8e9d3354d1da006ffa22ac80129d6d9451a204528ae15d139a81da8,Merge_failed,9feac2af3b2b59bf4888a8546638dfb54e620e1b9e2855f3a13e446a528ba4da,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,54b4dc514c796456071d9b16f19858a7ffcf133b440da2ded97392fbef5ef72b,Merge_failed,1c7ba7b89cf4b009fb5df5f4e63843dc9c4505a7f083baab6404a57b2262cb6f,0.013128280639648438,0.013209342956542969,0.012944221496582031,0.021321773529052734,0.013128042221069336,0.013079404830932617,0.013139963150024414,0.08809709548950195,0.30446934700012207,3.7994775772094727,3.797261953353882,0.07440781593322754,0.12430071830749512,0.0730886459350586,0.12691664695739746,0.12436413764953613,0.12827372550964355,0.12685680389404297,0.1286940574645996,0.12866950035095215,0.1283113956451416,0.12562084197998047,0.13132286071777344,0.22659039497375488,0.29046630859375,4.49027943611145,4.084845542907715,0.12766528129577637,0.12434864044189453,0.1251218318939209,0.12727069854736328,0.12888216972351074 diff --git a/results/combined/merges_timed/oripa/oripa.csv b/results/combined/merges_timed/oripa/oripa.csv index f68522a27c..6077d0d2f1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,True,18,39,428,2,True,18,Tests_passed,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,True,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,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,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,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,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,91e39ee48c7229af6171d0a1ddf733605d9022d5e0987aca1a30ddb71ed68045,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,0.03892326354980469,0.05414319038391113,0.062259674072265625,0.022951602935791016,0.05315566062927246,0.05780172348022461,0.053087711334228516,0.20013022422790527,0.12045001983642578,1.87746000289917,0.7705116271972656,0.04154515266418457,0.0694727897644043,0.041106462478637695,0.07059931755065918,0.07020187377929688 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,True,18,39,428,2,True,18,Tests_passed,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,True,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,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,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,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,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,91e39ee48c7229af6171d0a1ddf733605d9022d5e0987aca1a30ddb71ed68045,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,0.03892326354980469,0.05414319038391113,0.062259674072265625,0.022951602935791016,0.05315566062927246,0.05780172348022461,0.053087711334228516,0.20013022422790527,0.12045001983642578,1.87746000289917,0.7705116271972656,0.04154515266418457,0.0694727897644043,0.041106462478637695,0.07059931755065918,0.07020187377929688,0.06861567497253418,0.07002949714660645,0.07297539710998535,0.07259249687194824,0.07318639755249023,0.06991386413574219,0.06809210777282715,0.11199808120727539,0.1008296012878418,2.1345138549804688,0.830662727355957,0.07208108901977539,0.07060503959655762,0.0732576847076416,0.0707864761352539,0.07025790214538574 diff --git a/results/combined/merges_timed/oskopek/javaanpr.csv b/results/combined/merges_timed/oskopek/javaanpr.csv index de2e09dcd9..28c2401169 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,True,14,89,663,2,True,14,Tests_passed,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,True,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,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,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,4e6a424e7fc8ed2076ae6e67559248ddadc37d373953ff23c2d49c5df0dbdd58,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,0.05127120018005371,0.051033735275268555,0.061676025390625,0.016569137573242188,0.06185483932495117,0.06167292594909668,0.06154346466064453,0.10267281532287598,0.11104345321655273,0.05410504341125488,0.5808568000793457,0.04363226890563965,0.044591426849365234,0.04294300079345703,0.04516100883483887,0.045885562896728516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,True,14,89,663,2,True,14,Tests_passed,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,True,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,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,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,4e6a424e7fc8ed2076ae6e67559248ddadc37d373953ff23c2d49c5df0dbdd58,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,0.05127120018005371,0.051033735275268555,0.061676025390625,0.016569137573242188,0.06185483932495117,0.06167292594909668,0.06154346466064453,0.10267281532287598,0.11104345321655273,0.05410504341125488,0.5808568000793457,0.04363226890563965,0.044591426849365234,0.04294300079345703,0.04516100883483887,0.045885562896728516,0.04345583915710449,0.04456949234008789,0.04220104217529297,0.07647943496704102,0.07651114463806152,0.07787799835205078,0.07579207420349121,0.09764456748962402,0.08992743492126465,0.05723738670349121,0.675208330154419,0.10592246055603027,0.1001276969909668,0.10561776161193848,0.0914914608001709,0.08020496368408203 diff --git a/results/combined/merges_timed/outbrain/ob1k.csv b/results/combined/merges_timed/outbrain/ob1k.csv index 913b0bdca5..d441bb9b3c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,True,78,128,1869,2,True,78,Tests_passed,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,True,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,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,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,e5620d4923551afd2b4adf9dc0ca1acdad799a809c37e9b80212d276fe308c0b,Tests_passed,1dc075b94457c5d1e94cdebd1ea95f31f7aad9a7e4848c13142553b6aa66910e,Tests_passed,905c53550505960cfff0ecf629bac5408576ce9ab15f8d7a7b24080d725e1e9f,Tests_failed,e1483b79344e476e211f7e4f5c30cb09b7203c2f2c552d41afe305ef85e4b8d0,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,0.02040243148803711,0.020055532455444336,0.013815879821777344,0.02007603645324707,0.02260112762451172,0.014535903930664062,0.02242302894592285,0.05239534378051758,0.08128786087036133,0.504547119140625,0.799095630645752,0.04851698875427246,0.05288076400756836,0.04912829399108887,0.052440643310546875,0.05163407325744629 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,True,78,128,1869,2,True,78,Tests_passed,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,True,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,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,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,e5620d4923551afd2b4adf9dc0ca1acdad799a809c37e9b80212d276fe308c0b,Tests_passed,1dc075b94457c5d1e94cdebd1ea95f31f7aad9a7e4848c13142553b6aa66910e,Tests_passed,905c53550505960cfff0ecf629bac5408576ce9ab15f8d7a7b24080d725e1e9f,Tests_failed,e1483b79344e476e211f7e4f5c30cb09b7203c2f2c552d41afe305ef85e4b8d0,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,0.02040243148803711,0.020055532455444336,0.013815879821777344,0.02007603645324707,0.02260112762451172,0.014535903930664062,0.02242302894592285,0.05239534378051758,0.08128786087036133,0.504547119140625,0.799095630645752,0.04851698875427246,0.05288076400756836,0.04912829399108887,0.052440643310546875,0.05163407325744629,0.05015134811401367,0.050742149353027344,0.05357193946838379,0.05199790000915527,0.05176544189453125,0.06271982192993164,0.06726503372192383,0.1031341552734375,0.11712050437927246,0.634594202041626,0.950963020324707,0.06343698501586914,0.0621485710144043,0.06073117256164551,0.06265115737915039,0.06366753578186035 diff --git a/results/combined/merges_timed/overturetool/overture.csv b/results/combined/merges_timed/overturetool/overture.csv index 65fe2eebc5..08a1ba302d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,True,158,1228,4154.0,11,True,158,Tests_passed,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,True,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,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_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,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,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,0.09988856315612793,0.10146570205688477,0.12189722061157227,0.15282249450683594,0.12240982055664062,0.1214902400970459,0.1262073516845703,0.40166163444519043,0.6319694519042969,0.10422801971435547,11.3321852684021,0.19511842727661133,0.6117305755615234,0.19263148307800293,0.5849008560180664,0.6018459796905518 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,True,158,1228,4154.0,11,True,158,Tests_passed,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,True,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,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_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,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,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,0.09988856315612793,0.10146570205688477,0.12189722061157227,0.15282249450683594,0.12240982055664062,0.1214902400970459,0.1262073516845703,0.40166163444519043,0.6319694519042969,0.10422801971435547,11.3321852684021,0.19511842727661133,0.6117305755615234,0.19263148307800293,0.5849008560180664,0.6018459796905518,0.6001918315887451,0.5996911525726318,0.6253900527954102,0.6024188995361328,0.625838041305542,0.6290571689605713,0.6277427673339844,0.9488084316253662,0.9068851470947266,0.6471738815307617,11.635499000549316,0.5965454578399658,0.6051151752471924,0.5964655876159668,0.5760903358459473,0.5972034931182861 diff --git a/results/combined/merges_timed/oxo42/stateless4j.csv b/results/combined/merges_timed/oxo42/stateless4j.csv index 13df4adeb3..9822b5736a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,Tests_passed,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,True,26,95,1316,3,True,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,True,26,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,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,Merge_failed,0ad34ee8d0af7b8d58da1f1c7dc154a64a4af117ecd13e478780b91d4796896f,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,5591b4b5ab54d42f8466d5fa2002b4b612e9de1997718801589189e3c7d9a1d0,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,89f78bbf9fe0ed9e83460b80201577e55de687ab56940131d176fe15ae32dfdf,Tests_failed,3b37ce0fe427a5c0a8f2a89047dbb9614ada38eaa93e3def7b7b8ca32c89172d,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,0.013473033905029297,0.03914332389831543,0.011664390563964844,0.01597118377685547,0.04710578918457031,0.04133200645446777,0.04819345474243164,0.0589754581451416,0.15472054481506348,1.7773280143737793,0.6486520767211914,0.04465126991271973,0.06543231010437012,0.043309688568115234,0.06560730934143066,0.06722307205200195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,Tests_passed,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,True,26,95,1316,3,True,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,True,26,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,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,Merge_failed,0ad34ee8d0af7b8d58da1f1c7dc154a64a4af117ecd13e478780b91d4796896f,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,5591b4b5ab54d42f8466d5fa2002b4b612e9de1997718801589189e3c7d9a1d0,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,89f78bbf9fe0ed9e83460b80201577e55de687ab56940131d176fe15ae32dfdf,Tests_failed,3b37ce0fe427a5c0a8f2a89047dbb9614ada38eaa93e3def7b7b8ca32c89172d,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,0.013473033905029297,0.03914332389831543,0.011664390563964844,0.01597118377685547,0.04710578918457031,0.04133200645446777,0.04819345474243164,0.0589754581451416,0.15472054481506348,1.7773280143737793,0.6486520767211914,0.04465126991271973,0.06543231010437012,0.043309688568115234,0.06560730934143066,0.06722307205200195,0.06739568710327148,0.06839561462402344,0.0663461685180664,0.06615114212036133,0.0665130615234375,0.06547880172729492,0.06817436218261719,0.11641526222229004,0.13889384269714355,2.0535666942596436,0.7770137786865234,0.0675668716430664,0.06652021408081055,0.0673224925994873,0.06662917137145996,0.06645822525024414 diff --git a/results/combined/merges_timed/pablissimo/sonartsplugin.csv b/results/combined/merges_timed/pablissimo/sonartsplugin.csv index c5c430416a..eddea80071 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,21c5ac9cfd807b5575685ea58ea31f243afeb018,83fb48d7c14e86b310a38ae7b59201678db9583a,63c9fea3fce9e42d6c1303ee4cd1e05ea53fe9ba,,True,True,True,47,306,3724,5,True,47,Tests_passed,272cf78fa4a833425a7668420e3a1393a4a21114b99b4b15b8641947d840e296,True,Tests_passed,05e66d8eeae44e91d5493390c40e15d5df73852c230dbbdd2d7a6b59f72eba1e,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,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,66aff4927abec456854ded97b6a517f572837b04bf6b258de05ac5e20ab240c9,Merge_failed,05698bc4149e541761d6f117eea645cf5ed091e9c538c10b721d8bc7da0c2dc9,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,9172b364c54c6ef4b1f8b805922ade77d52fffb71c279ce9b7a1a2b3d0734e5d,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,7f693587bf6306bd0cc730f9ae91fbf69808c52c96decca657610cb8ca6d72c5,Merge_timedout,,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,0.01019597053527832,0.01032876968383789,0.01031041145324707,0.01807880401611328,0.010779380798339844,0.010555505752563477,0.010591268539428711,0.07050776481628418,0.2378370761871338,3.1889634132385254,-1.0,0.05841350555419922,0.09655880928039551,0.07048177719116211,0.1167597770690918,0.09843659400939941 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,21c5ac9cfd807b5575685ea58ea31f243afeb018,83fb48d7c14e86b310a38ae7b59201678db9583a,63c9fea3fce9e42d6c1303ee4cd1e05ea53fe9ba,,True,True,True,47,306,3724,5,True,47,Tests_passed,272cf78fa4a833425a7668420e3a1393a4a21114b99b4b15b8641947d840e296,True,Tests_passed,05e66d8eeae44e91d5493390c40e15d5df73852c230dbbdd2d7a6b59f72eba1e,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,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,66aff4927abec456854ded97b6a517f572837b04bf6b258de05ac5e20ab240c9,Merge_failed,05698bc4149e541761d6f117eea645cf5ed091e9c538c10b721d8bc7da0c2dc9,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,9172b364c54c6ef4b1f8b805922ade77d52fffb71c279ce9b7a1a2b3d0734e5d,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,7f693587bf6306bd0cc730f9ae91fbf69808c52c96decca657610cb8ca6d72c5,Merge_timedout,,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,0.01019597053527832,0.01032876968383789,0.01031041145324707,0.01807880401611328,0.010779380798339844,0.010555505752563477,0.010591268539428711,0.07050776481628418,0.2378370761871338,3.1889634132385254,-1.0,0.05841350555419922,0.09655880928039551,0.07048177719116211,0.1167597770690918,0.09843659400939941,0.1170508861541748,0.09805846214294434,0.1192471981048584,0.09960818290710449,0.12004327774047852,0.11722731590270996,0.12715840339660645,0.19992947578430176,0.23604083061218262,3.8307418823242188,-1.0,0.12165999412536621,0.1197967529296875,0.11828207969665527,0.11577796936035156,0.09691548347473145 diff --git a/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv b/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv index d3e57584fb..630411fbdd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,True,213,457,2960,2,True,213,Tests_passed,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,True,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,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,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,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,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,eeaa2e1d8e864bfb3563082d77ffcdd354a478423463202b70fd490d9fcd0963,Tests_failed,4c2d3d9fd78ffeaa19a8fa4cfeec5694c66663ff2d8ba13845893b74c4980da4,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.03476595878601074,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.07686138153076172,0.9904115200042725,1.532193899154663,0.10708260536193848,0.1287086009979248,0.05201148986816406,0.134474515914917,0.07884550094604492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,True,213,457,2960,2,True,213,Tests_passed,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,True,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,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,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,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,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,eeaa2e1d8e864bfb3563082d77ffcdd354a478423463202b70fd490d9fcd0963,Tests_failed,4c2d3d9fd78ffeaa19a8fa4cfeec5694c66663ff2d8ba13845893b74c4980da4,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.03476595878601074,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.07686138153076172,0.9904115200042725,1.532193899154663,0.10708260536193848,0.1287086009979248,0.05201148986816406,0.134474515914917,0.07884550094604492,0.10249829292297363,0.07750368118286133,0.1419687271118164,0.11510872840881348,0.08475542068481445,0.14244723320007324,0.07963061332702637,0.18688654899597168,0.13822579383850098,0.9741935729980469,1.6378779411315918,0.07729816436767578,0.13008785247802734,0.08582520484924316,0.07792782783508301,0.12486600875854492 diff --git a/results/combined/merges_timed/pandcorps/pandam.csv b/results/combined/merges_timed/pandcorps/pandam.csv index 9147e81365..66bb8bd5a0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,True,32,101,751,2,True,32,Tests_passed,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,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,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_failed,477ebf62071c211b28cfb2c2280bbe1dbd9ba1468cefcdafd547aa387e4d5bf1,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,0.04679727554321289,0.050315141677856445,0.06716060638427734,0.029172658920288086,0.06045174598693848,0.04166388511657715,0.0744321346282959,0.20893239974975586,0.12561917304992676,2.8711061477661133,1.7033941745758057,0.05641770362854004,0.09291195869445801,0.053354501724243164,0.09284353256225586,0.09527826309204102 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,True,32,101,751,2,True,32,Tests_passed,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,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,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_failed,477ebf62071c211b28cfb2c2280bbe1dbd9ba1468cefcdafd547aa387e4d5bf1,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,Tests_passed,cffef8dde6aad04d9ef5f6a63bf80105042a1fa2ba2358874ac09018fb9ad415,0.04679727554321289,0.050315141677856445,0.06716060638427734,0.029172658920288086,0.06045174598693848,0.04166388511657715,0.0744321346282959,0.20893239974975586,0.12561917304992676,2.8711061477661133,1.7033941745758057,0.05641770362854004,0.09291195869445801,0.053354501724243164,0.09284353256225586,0.09527826309204102,0.0924234390258789,0.09435749053955078,0.09881067276000977,0.0988473892211914,0.09900140762329102,0.10120296478271484,0.09639358520507812,0.13762521743774414,0.13153624534606934,2.875060558319092,1.8776614665985107,0.09112262725830078,0.09196233749389648,0.09616875648498535,0.08996009826660156,0.09420251846313477 diff --git a/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv b/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv index f7e83fb14d..9770a23690 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,True,True,Tests_passed,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,True,2,9,26,2,True,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,True,2,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,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,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,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,89b875f9dc1bca54e254c4f8a2c6033e945ff5d382878eb84364a4c88d3fc516,Tests_failed,e6024b2c17530844610b255245c07146e8cac0aacd9c61d29e77d495a0b0d7d5,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,0.03734540939331055,0.03682994842529297,0.03758955001831055,0.012936830520629883,0.04068350791931152,0.03925800323486328,0.036895036697387695,0.10448431968688965,0.11121034622192383,0.7201402187347412,0.34188389778137207,0.028055191040039062,0.04949617385864258,0.027564525604248047,0.05037808418273926,0.04900026321411133 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,True,True,Tests_passed,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,True,2,9,26,2,True,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,True,2,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,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,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,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,89b875f9dc1bca54e254c4f8a2c6033e945ff5d382878eb84364a4c88d3fc516,Tests_failed,e6024b2c17530844610b255245c07146e8cac0aacd9c61d29e77d495a0b0d7d5,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,0.03734540939331055,0.03682994842529297,0.03758955001831055,0.012936830520629883,0.04068350791931152,0.03925800323486328,0.036895036697387695,0.10448431968688965,0.11121034622192383,0.7201402187347412,0.34188389778137207,0.028055191040039062,0.04949617385864258,0.027564525604248047,0.05037808418273926,0.04900026321411133,0.0508723258972168,0.051217079162597656,0.05071234703063965,0.05010628700256348,0.050909996032714844,0.051017045974731445,0.05109667778015137,0.08207154273986816,0.0804741382598877,0.8657512664794922,0.4055747985839844,0.05025815963745117,0.049570560455322266,0.05038189888000488,0.050247907638549805,0.05002593994140625 diff --git a/results/combined/merges_timed/paulosuzart/jtornado.csv b/results/combined/merges_timed/paulosuzart/jtornado.csv index d6c5a812bd..2c7d5cfc69 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,False,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,True,4,18,74,2,True,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,True,4,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,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Tests_failed,243ec1745f6f7b66095c5d4bb23ebc3bfef88f519d3aa5ded383291d2938a942,Merge_failed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,04840561d9917c5820ccf8248aa893a9a8ed5a21d7b6a38f267b5b533488cedd,Tests_failed,7fa97faf101db39b1f24dbed47185993ca37fd63488051fcbe0c98947857b5ef,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,0.039136409759521484,0.042028188705444336,0.037821054458618164,0.013310670852661133,0.03915047645568848,0.03924441337585449,0.031238317489624023,0.16216182708740234,0.1154944896697998,1.0975360870361328,0.3451094627380371,0.04045248031616211,0.055396318435668945,0.039435386657714844,0.0546877384185791,0.05388641357421875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,False,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,True,4,18,74,2,True,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,True,4,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,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Tests_failed,243ec1745f6f7b66095c5d4bb23ebc3bfef88f519d3aa5ded383291d2938a942,Merge_failed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,04840561d9917c5820ccf8248aa893a9a8ed5a21d7b6a38f267b5b533488cedd,Tests_failed,7fa97faf101db39b1f24dbed47185993ca37fd63488051fcbe0c98947857b5ef,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,0.039136409759521484,0.042028188705444336,0.037821054458618164,0.013310670852661133,0.03915047645568848,0.03924441337585449,0.031238317489624023,0.16216182708740234,0.1154944896697998,1.0975360870361328,0.3451094627380371,0.04045248031616211,0.055396318435668945,0.039435386657714844,0.0546877384185791,0.05388641357421875,0.050208091735839844,0.053134918212890625,0.05161619186401367,0.05421042442321777,0.050318241119384766,0.05045270919799805,0.052477359771728516,0.08221578598022461,0.08801651000976562,1.1215639114379883,0.37035083770751953,0.051645755767822266,0.050269126892089844,0.05016016960144043,0.05221867561340332,0.05205106735229492 diff --git a/results/combined/merges_timed/pax95/camel-ironmq.csv b/results/combined/merges_timed/pax95/camel-ironmq.csv index 90a091ffeb..40c82eec4e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,True,True,Tests_passed,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,True,22,111,665,8,True,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,True,24,True,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,52b5479eb7acce0e533ee45008c2270ae29371f4e989d8348f7b6a6a61a3dbf5,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,Merge_failed,08b6d770995fe458fc168e93884fd6c6e6d98edb5fd6fa1e2372a72731dfa981,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,0ce3c0708e419a14b755deaccf6fe81a65713c4f91193b52514e4de79f17f013,Merge_failed,d14c2700c93a2480216fbfd9c61cf8fed99b586605774691635739536be92626,Merge_failed,d14c2700c93a2480216fbfd9c61cf8fed99b586605774691635739536be92626,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,770e018d660d6214ad2685c771c3353655734f39cae655711061147aabc04069,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,3dc0a6d113a153809ffbdd144de580fa8d5c4d89a7fc69c3749558fe9053ca6d,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,0.009878158569335938,0.0095977783203125,0.009421110153198242,0.01471567153930664,0.008942127227783203,0.008879661560058594,0.008962154388427734,0.07873725891113281,0.2902796268463135,2.179783344268799,0.5658431053161621,0.07163429260253906,0.09014058113098145,0.06911802291870117,0.0979158878326416,0.09567666053771973 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,True,True,Tests_passed,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,True,22,111,665,8,True,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,True,24,True,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,52b5479eb7acce0e533ee45008c2270ae29371f4e989d8348f7b6a6a61a3dbf5,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,Merge_failed,08b6d770995fe458fc168e93884fd6c6e6d98edb5fd6fa1e2372a72731dfa981,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,0ce3c0708e419a14b755deaccf6fe81a65713c4f91193b52514e4de79f17f013,Merge_failed,d14c2700c93a2480216fbfd9c61cf8fed99b586605774691635739536be92626,Merge_failed,d14c2700c93a2480216fbfd9c61cf8fed99b586605774691635739536be92626,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,770e018d660d6214ad2685c771c3353655734f39cae655711061147aabc04069,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,3dc0a6d113a153809ffbdd144de580fa8d5c4d89a7fc69c3749558fe9053ca6d,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,ab66935c247d2e25d917ccdefe3fe678c8175765234fe3c3998af4f7cfb6412b,Merge_failed,5f16a06d87827606c3e9daa36ea735df38b8bbb9b4a21a223b1718bf78dc66e9,0.009878158569335938,0.0095977783203125,0.009421110153198242,0.01471567153930664,0.008942127227783203,0.008879661560058594,0.008962154388427734,0.07873725891113281,0.2902796268463135,2.179783344268799,0.5658431053161621,0.07163429260253906,0.09014058113098145,0.06911802291870117,0.0979158878326416,0.09567666053771973,0.0935518741607666,0.09346270561218262,0.09351706504821777,0.0920712947845459,0.09457612037658691,0.09433627128601074,0.09315156936645508,0.1863541603088379,0.23817133903503418,2.344717502593994,0.6517927646636963,0.09382462501525879,0.09397482872009277,0.09082388877868652,0.09442949295043945,0.0925607681274414 diff --git a/results/combined/merges_timed/pedrovgs/algorithms.csv b/results/combined/merges_timed/pedrovgs/algorithms.csv index cfe33d5fef..5f55c0a3e3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,c3d769d20c95761fb8d9cc67ee80344f12b2dd5e04b0344c6955b971df527ab0,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.020484447479248047,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.16540098190307617,0.8052289485931396,0.2341928482055664,0.03839397430419922,0.046031951904296875,0.04616999626159668,0.04748249053955078,0.04601407051086426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,c3d769d20c95761fb8d9cc67ee80344f12b2dd5e04b0344c6955b971df527ab0,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.020484447479248047,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.16540098190307617,0.8052289485931396,0.2341928482055664,0.03839397430419922,0.046031951904296875,0.04616999626159668,0.04748249053955078,0.04601407051086426,0.04734444618225098,0.03987908363342285,0.04658007621765137,0.04709315299987793,0.048629045486450195,0.04721975326538086,0.03927922248840332,0.09900116920471191,0.10884976387023926,0.8557541370391846,0.2830324172973633,0.04421234130859375,0.038680315017700195,0.046623945236206055,0.03896141052246094,0.04552459716796875 diff --git a/results/combined/merges_timed/peterisp/morphology.csv b/results/combined/merges_timed/peterisp/morphology.csv index 8196f28153..4b5667d340 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,True,True,True,43,54928,556327,2,True,43,Tests_passed,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,True,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,916a4be8953444f0729c45dca965019d62680d6dbdc9352d3a1654092bc94c8d,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,21543d1f77f4a68290d9c134036c0899134fed03777acb5eb70c38f19bc64f6c,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,0.414808988571167,0.4120800495147705,0.47051215171813965,0.5267620086669922,0.48722004890441895,0.48494553565979004,0.47371888160705566,0.6412079334259033,0.469799280166626,3.270989418029785,3.2965145111083984,0.6457152366638184,0.5794568061828613,0.6494467258453369,0.5765607357025146,0.5726323127746582 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,True,True,True,43,54928,556327,2,True,43,Tests_passed,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,True,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,916a4be8953444f0729c45dca965019d62680d6dbdc9352d3a1654092bc94c8d,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,21543d1f77f4a68290d9c134036c0899134fed03777acb5eb70c38f19bc64f6c,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,0.414808988571167,0.4120800495147705,0.47051215171813965,0.5267620086669922,0.48722004890441895,0.48494553565979004,0.47371888160705566,0.6412079334259033,0.469799280166626,3.270989418029785,3.2965145111083984,0.6457152366638184,0.5794568061828613,0.6494467258453369,0.5765607357025146,0.5726323127746582,0.5597257614135742,0.5589070320129395,0.6311814785003662,0.6292383670806885,0.6145064830780029,0.624255895614624,0.6299700736999512,0.7494194507598877,0.7240455150604248,3.25856614112854,3.6345784664154053,0.5639762878417969,0.5721900463104248,0.5630419254302979,0.5551834106445312,0.5584924221038818 diff --git a/results/combined/merges_timed/petitparser/java-petitparser.csv b/results/combined/merges_timed/petitparser/java-petitparser.csv index e68160edb3..3c6196695b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,18,89,800,5,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,19,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,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Tests_passed,6a90f4b7bc33e9f919ad85773990cabe2c91b61e9782786d2d7907fb2178e652,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,eeb772ad340d21a14297fc8173b7844cf529c7f8d8a9c69fb8c79ec6476f3433,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,9b8ce13ab0af319e086a4018297d687cd67eee6c090a8826d160e719251fd93a,Tests_passed,9e8cef472ffa900f053502d985d9a13f2808677fdb47b5328e020966d0ce8e07,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.039159297943115234,0.04037356376647949,0.04064679145812988,0.017647504806518555,0.04466891288757324,0.033734798431396484,0.01953268051147461,0.30957603454589844,0.22362327575683594,1.4305689334869385,1.1271014213562012,0.04630780220031738,0.08285927772521973,0.044515371322631836,0.08250021934509277,0.08333206176757812 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,18,89,800,5,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,19,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,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Tests_passed,6a90f4b7bc33e9f919ad85773990cabe2c91b61e9782786d2d7907fb2178e652,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,eeb772ad340d21a14297fc8173b7844cf529c7f8d8a9c69fb8c79ec6476f3433,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,9b8ce13ab0af319e086a4018297d687cd67eee6c090a8826d160e719251fd93a,Tests_passed,9e8cef472ffa900f053502d985d9a13f2808677fdb47b5328e020966d0ce8e07,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.039159297943115234,0.04037356376647949,0.04064679145812988,0.017647504806518555,0.04466891288757324,0.033734798431396484,0.01953268051147461,0.30957603454589844,0.22362327575683594,1.4305689334869385,1.1271014213562012,0.04630780220031738,0.08285927772521973,0.044515371322631836,0.08250021934509277,0.08333206176757812,0.08082890510559082,0.08214855194091797,0.08251070976257324,0.08467578887939453,0.08430695533752441,0.08397483825683594,0.08489656448364258,0.14807415008544922,0.174424409866333,1.5392327308654785,1.339704990386963,0.08594989776611328,0.0821678638458252,0.08373618125915527,0.08423948287963867,0.08401942253112793 diff --git a/results/combined/merges_timed/phaed420/simpleclans.csv b/results/combined/merges_timed/phaed420/simpleclans.csv index 5ecbd3ef6e..058d5ab831 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,True,47,111,5000.0,8,True,47,Tests_passed,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,True,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,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,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,Merge_failed,ca76d1ce458fc934eaa9026d3149c1998a69e7ac95ae30e3267845aaab7e19c3,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,ff8b2f1a1293e73b6505545dfd0f6a48dc8bed45724cb76198ef5ab04f3faafd,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,ec31c36d031dd8f9953f0c561fcb042ed63c0d913ba5a9e2ce458928bac60426,Merge_failed,5c56307c68bf10d334f58cab92ac70a158340de03fec13c25e4b6ae44140da45,Merge_failed,8eb106015b7aa1d7ef0985b8a27ae1b15368556a241e20659e87ee8fba2f6868,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,0.016922712326049805,0.017435550689697266,0.018819808959960938,0.028325796127319336,0.01875925064086914,0.018866777420043945,0.018762826919555664,0.11476302146911621,0.3520810604095459,3.8980796337127686,0.9054200649261475,0.09449529647827148,0.1373002529144287,0.1409013271331787,0.24806880950927734,0.1543891429901123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,True,47,111,5000.0,8,True,47,Tests_passed,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,True,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,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,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,Merge_failed,ca76d1ce458fc934eaa9026d3149c1998a69e7ac95ae30e3267845aaab7e19c3,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,ff8b2f1a1293e73b6505545dfd0f6a48dc8bed45724cb76198ef5ab04f3faafd,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,ec31c36d031dd8f9953f0c561fcb042ed63c0d913ba5a9e2ce458928bac60426,Merge_failed,5c56307c68bf10d334f58cab92ac70a158340de03fec13c25e4b6ae44140da45,Merge_failed,8eb106015b7aa1d7ef0985b8a27ae1b15368556a241e20659e87ee8fba2f6868,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,4f9c031b497f31e8fc631ace9b0c5caf18971b60a5558f157551fa7c50037c62,Merge_failed,0b5ea9f8226d33258870c7c05511b1459fd2a9d9faaf93f9577644daef1f0b1f,0.016922712326049805,0.017435550689697266,0.018819808959960938,0.028325796127319336,0.01875925064086914,0.018866777420043945,0.018762826919555664,0.11476302146911621,0.3520810604095459,3.8980796337127686,0.9054200649261475,0.09449529647827148,0.1373002529144287,0.1409013271331787,0.24806880950927734,0.1543891429901123,0.24178361892700195,0.14074301719665527,0.2465038299560547,0.13963055610656738,0.24315786361694336,0.24631905555725098,0.24529814720153809,0.3648853302001953,0.42016124725341797,4.149976015090942,1.173689365386963,0.24356746673583984,0.23702263832092285,0.24344873428344727,0.2406904697418213,0.14223670959472656 diff --git a/results/combined/merges_timed/phantomydn/wicket-orientdb.csv b/results/combined/merges_timed/phantomydn/wicket-orientdb.csv index b481c1c20d..c8d473f47e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,True,6,9,116,2,True,6,Tests_passed,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,True,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,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,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,3c8f1c952b9777466ce3d9fbbdbd95ed0db5bb0a3cc580b24a07ab3510a3b8b1,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,0.011815786361694336,0.011629819869995117,0.012526750564575195,0.020659208297729492,0.012380123138427734,0.012618303298950195,0.012526750564575195,0.038996219635009766,0.07094645500183105,0.7312419414520264,0.2877776622772217,0.04364919662475586,0.048570871353149414,0.047171831130981445,0.04755592346191406,0.04642844200134277 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,True,6,9,116,2,True,6,Tests_passed,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,True,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,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,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,3c8f1c952b9777466ce3d9fbbdbd95ed0db5bb0a3cc580b24a07ab3510a3b8b1,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,0.011815786361694336,0.011629819869995117,0.012526750564575195,0.020659208297729492,0.012380123138427734,0.012618303298950195,0.012526750564575195,0.038996219635009766,0.07094645500183105,0.7312419414520264,0.2877776622772217,0.04364919662475586,0.048570871353149414,0.047171831130981445,0.04755592346191406,0.04642844200134277,0.048528432846069336,0.04278707504272461,0.04736161231994629,0.04418587684631348,0.0484464168548584,0.048888206481933594,0.048076629638671875,0.08374500274658203,0.0854954719543457,0.8767135143280029,0.3671553134918213,0.041951656341552734,0.04639148712158203,0.048043251037597656,0.04799199104309082,0.047835588455200195 diff --git a/results/combined/merges_timed/phax/jcodemodel.csv b/results/combined/merges_timed/phax/jcodemodel.csv index 56065c1809..65183db7a2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,True,199,203,1190,2,True,199,Tests_passed,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,True,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,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,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,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_failed,1fbc004eba36ff650fa3c2ae0ccea17090d109bbcee1ef61cd288daa73109ab4,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,0.0571746826171875,0.04491162300109863,0.0561518669128418,0.0398409366607666,0.05363059043884277,0.056411027908325195,0.05794382095336914,0.18787217140197754,0.11075305938720703,0.04973888397216797,1.389056921005249,0.0663301944732666,0.09234404563903809,0.06634736061096191,0.09002923965454102,0.09326052665710449 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,True,199,203,1190,2,True,199,Tests_passed,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,True,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,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,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,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_failed,1fbc004eba36ff650fa3c2ae0ccea17090d109bbcee1ef61cd288daa73109ab4,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,0.0571746826171875,0.04491162300109863,0.0561518669128418,0.0398409366607666,0.05363059043884277,0.056411027908325195,0.05794382095336914,0.18787217140197754,0.11075305938720703,0.04973888397216797,1.389056921005249,0.0663301944732666,0.09234404563903809,0.06634736061096191,0.09002923965454102,0.09326052665710449,0.09189867973327637,0.08942413330078125,0.09766554832458496,0.10201191902160645,0.09797310829162598,0.09764599800109863,0.09669089317321777,0.14440107345581055,0.13924288749694824,0.11575102806091309,1.5416007041931152,0.09096360206604004,0.08802294731140137,0.09192085266113281,0.08823490142822266,0.09193921089172363 diff --git a/results/combined/merges_timed/pholser/jopt-simple.csv b/results/combined/merges_timed/pholser/jopt-simple.csv index 947809a3b8..734229507f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,True,177,474,1451,5,True,177,Tests_passed,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,True,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,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,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,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,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,23257c6dc350a0d2fcfaff92f314f16b04ae507ff8ee2d247606346c6c4c48d5,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,0.018728256225585938,0.01936793327331543,0.020748138427734375,0.028528213500976562,0.02269744873046875,0.022199392318725586,0.022182226181030273,0.09647417068481445,0.24457192420959473,2.4191038608551025,1.1108710765838623,0.05319547653198242,0.1368732452392578,0.04924345016479492,0.13049793243408203,0.13199377059936523 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,True,177,474,1451,5,True,177,Tests_passed,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,True,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,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,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,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,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,23257c6dc350a0d2fcfaff92f314f16b04ae507ff8ee2d247606346c6c4c48d5,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,0.018728256225585938,0.01936793327331543,0.020748138427734375,0.028528213500976562,0.02269744873046875,0.022199392318725586,0.022182226181030273,0.09647417068481445,0.24457192420959473,2.4191038608551025,1.1108710765838623,0.05319547653198242,0.1368732452392578,0.04924345016479492,0.13049793243408203,0.13199377059936523,0.12977147102355957,0.12417411804199219,0.1304793357849121,0.1316978931427002,0.13029170036315918,0.1345970630645752,0.13558602333068848,0.21827268600463867,0.23703360557556152,2.327341079711914,1.196906566619873,0.13108587265014648,0.11943578720092773,0.126861572265625,0.12481045722961426,0.12745976448059082 diff --git a/results/combined/merges_timed/pholser/junit-quickcheck.csv b/results/combined/merges_timed/pholser/junit-quickcheck.csv index ebb1ea161e..f297938402 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,True,432,469,1217,5,True,432,Tests_passed,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,True,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03385615348815918,0.04625105857849121,0.05042719841003418,0.04365730285644531,0.049298763275146484,0.053858041763305664,0.05949211120605469,0.3568844795227051,0.29055333137512207,3.0934879779815674,2.9443917274475098,0.0731205940246582,0.17557263374328613,0.07429718971252441,0.17306923866271973,0.1569812297821045 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,True,432,469,1217,5,True,432,Tests_passed,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,True,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03385615348815918,0.04625105857849121,0.05042719841003418,0.04365730285644531,0.049298763275146484,0.053858041763305664,0.05949211120605469,0.3568844795227051,0.29055333137512207,3.0934879779815674,2.9443917274475098,0.0731205940246582,0.17557263374328613,0.07429718971252441,0.17306923866271973,0.1569812297821045,0.1633312702178955,0.16251492500305176,0.16862773895263672,0.17032909393310547,0.1673293113708496,0.16941165924072266,0.16609621047973633,0.23372507095336914,0.2633185386657715,3.176912307739258,3.042804002761841,0.15906620025634766,0.16568589210510254,0.1595151424407959,0.16307902336120605,0.1689300537109375 diff --git a/results/combined/merges_timed/pires/obd-java-api.csv b/results/combined/merges_timed/pires/obd-java-api.csv index 9cd78947f1..4aee45d71c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,True,10,25,259,4,True,10,Tests_passed,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,True,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,True,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,dd7daa8a8bf71d619a6f82863f46e19a55a6454f7126886b2113939953b97edf,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,0.041791677474975586,0.043460845947265625,0.0485539436340332,0.01659679412841797,0.04042387008666992,0.04159355163574219,0.0474400520324707,0.3143136501312256,0.23618769645690918,1.6029725074768066,0.39590930938720703,0.039441585540771484,0.061298370361328125,0.039871931076049805,0.06307554244995117,0.061867475509643555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,True,10,25,259,4,True,10,Tests_passed,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,True,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,True,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,dd7daa8a8bf71d619a6f82863f46e19a55a6454f7126886b2113939953b97edf,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,0.041791677474975586,0.043460845947265625,0.0485539436340332,0.01659679412841797,0.04042387008666992,0.04159355163574219,0.0474400520324707,0.3143136501312256,0.23618769645690918,1.6029725074768066,0.39590930938720703,0.039441585540771484,0.061298370361328125,0.039871931076049805,0.06307554244995117,0.061867475509643555,0.06357765197753906,0.061248779296875,0.06397223472595215,0.06398224830627441,0.06360030174255371,0.06365442276000977,0.061611175537109375,0.13081765174865723,0.14283132553100586,1.8138377666473389,0.4902644157409668,0.06256294250488281,0.06442523002624512,0.06316900253295898,0.06282544136047363,0.06419253349304199 diff --git a/results/combined/merges_timed/plaid/plaid-java.csv b/results/combined/merges_timed/plaid/plaid-java.csv index dbbd3099b7..96d8043d66 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,True,True,True,19,42,728,2,True,19,Tests_passed,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,True,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,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,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,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,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,66c746928c97a465a3b8d2f0089ebc7e2e9a0c4eb5fde60e8592446ced76e42d,Tests_failed,e8b0d49ea544bb5ee01262c6dc68a8fb04236e291f40ded1fbcf7ae7a317212d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,0.05514383316040039,0.04605984687805176,0.03869152069091797,0.01816105842590332,0.01608896255493164,0.050669193267822266,0.03977680206298828,0.16525006294250488,0.11487770080566406,0.8094010353088379,0.4348793029785156,0.03851747512817383,0.0639340877532959,0.04129815101623535,0.06544709205627441,0.06129169464111328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,True,True,True,19,42,728,2,True,19,Tests_passed,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,True,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,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,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,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,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,66c746928c97a465a3b8d2f0089ebc7e2e9a0c4eb5fde60e8592446ced76e42d,Tests_failed,e8b0d49ea544bb5ee01262c6dc68a8fb04236e291f40ded1fbcf7ae7a317212d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,0.05514383316040039,0.04605984687805176,0.03869152069091797,0.01816105842590332,0.01608896255493164,0.050669193267822266,0.03977680206298828,0.16525006294250488,0.11487770080566406,0.8094010353088379,0.4348793029785156,0.03851747512817383,0.0639340877532959,0.04129815101623535,0.06544709205627441,0.06129169464111328,0.06290078163146973,0.06645679473876953,0.06688880920410156,0.06564712524414062,0.061289072036743164,0.06833577156066895,0.06772303581237793,0.10631227493286133,0.09786033630371094,1.0893895626068115,0.5129177570343018,0.0649878978729248,0.06304621696472168,0.06583189964294434,0.06593799591064453,0.06356978416442871 diff --git a/results/combined/merges_timed/plum-umd/rubah.csv b/results/combined/merges_timed/plum-umd/rubah.csv index 6b41a8d4f3..8efe4a618a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,True,True,Tests_passed,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,True,40,268,1561,2,True,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,True,40,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,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,08ab0ab27964c4cbacda24ee71a426afd8edecae529314f5ece3df44858bf0d6,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,0.05342674255371094,0.03730154037475586,0.051659345626831055,0.03047633171081543,0.05410456657409668,0.0503230094909668,0.05350828170776367,0.17432117462158203,0.12256169319152832,0.7606844902038574,0.8141932487487793,0.036498308181762695,0.07735681533813477,0.03756141662597656,0.07755064964294434,0.06422758102416992 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,True,True,Tests_passed,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,True,40,268,1561,2,True,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,True,40,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,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,08ab0ab27964c4cbacda24ee71a426afd8edecae529314f5ece3df44858bf0d6,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,Tests_passed,1ade8080fab16903baba7e0752433d3b2762180bd67583c46d158b76b22fe10e,0.05342674255371094,0.03730154037475586,0.051659345626831055,0.03047633171081543,0.05410456657409668,0.0503230094909668,0.05350828170776367,0.17432117462158203,0.12256169319152832,0.7606844902038574,0.8141932487487793,0.036498308181762695,0.07735681533813477,0.03756141662597656,0.07755064964294434,0.06422758102416992,0.07692074775695801,0.0772562026977539,0.06686806678771973,0.08422684669494629,0.06508064270019531,0.0790708065032959,0.0847318172454834,0.11963248252868652,0.11448192596435547,0.8239092826843262,0.9173271656036377,0.07818722724914551,0.07820701599121094,0.07898569107055664,0.06481051445007324,0.07414603233337402 diff --git a/results/combined/merges_timed/plutext/docx4j.csv b/results/combined/merges_timed/plutext/docx4j.csv index 33ecdc6146..5d98e5ef5b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,True,58,146,6548,217,True,249,Tests_passed,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,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,Merge_timedout,,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Merge_timedout,,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,0.03621029853820801,0.03673434257507324,0.049668312072753906,0.06278109550476074,0.04985618591308594,0.049483537673950195,0.04905056953430176,0.05588817596435547,0.037664175033569336,0.03977847099304199,-1.0,0.08959531784057617,0.6331117153167725,0.08571934700012207,0.6344425678253174,0.6266334056854248 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,True,58,146,6548,217,True,249,Tests_passed,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,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,Merge_timedout,,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Merge_timedout,,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,Tests_passed,a0c0a500d92c06ce1d0ab1b0bba60249608a19def075d7acf9a80a923f821cff,0.03621029853820801,0.03673434257507324,0.049668312072753906,0.06278109550476074,0.04985618591308594,0.049483537673950195,0.04905056953430176,0.05588817596435547,0.037664175033569336,0.03977847099304199,-1.0,0.08959531784057617,0.6331117153167725,0.08571934700012207,0.6344425678253174,0.6266334056854248,0.5762314796447754,0.5924968719482422,0.6083705425262451,0.600877046585083,0.6182167530059814,0.6061553955078125,0.6020781993865967,0.6038031578063965,0.6107265949249268,0.6048717498779297,-1.0,0.5976207256317139,0.5841784477233887,0.5885586738586426,0.5872442722320557,0.5912513732910156 diff --git a/results/combined/merges_timed/pmd/pmd.csv b/results/combined/merges_timed/pmd/pmd.csv index 93a7780709..a6af4b25e9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,435,1197,8416.0,3,True,435,Tests_passed,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,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,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Merge_timedout,,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,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,e18ff5bca3ae006b365cd9022440f7a64cc896d98f177fd7204fe6b6ae344873,Merge_timedout,,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.0778965950012207,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.1633446216583252,0.7231693267822266,-1.0,0.12255311012268066,0.17115044593811035,0.11538434028625488,0.1745133399963379,0.1714482307434082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,435,1197,8416.0,3,True,435,Tests_passed,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,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,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Merge_timedout,,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,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,e18ff5bca3ae006b365cd9022440f7a64cc896d98f177fd7204fe6b6ae344873,Merge_timedout,,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.0778965950012207,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.1633446216583252,0.7231693267822266,-1.0,0.12255311012268066,0.17115044593811035,0.11538434028625488,0.1745133399963379,0.1714482307434082,0.15763115882873535,0.16083574295043945,0.1752622127532959,0.18525934219360352,0.18263030052185059,0.18392395973205566,0.1799149513244629,0.2499864101409912,0.2298884391784668,0.8100109100341797,-1.0,0.1663665771484375,0.1600182056427002,0.16784954071044922,0.16509175300598145,0.16259551048278809 diff --git a/results/combined/merges_timed/poetix/protonpack.csv b/results/combined/merges_timed/poetix/protonpack.csv index 33c948c225..85f6c96e66 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,True,True,Tests_passed,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,True,13,15,494,2,True,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,True,13,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,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,036ebedac33fd74fe34e9e4c7fb298b0f971fab42534668a202256e19604c57f,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,0.03695416450500488,0.03446793556213379,0.04493856430053711,0.015329599380493164,0.0479588508605957,0.04027962684631348,0.0364227294921875,0.16062402725219727,0.10717511177062988,0.8181695938110352,0.3046095371246338,0.032118797302246094,0.059342384338378906,0.03151869773864746,0.0584561824798584,0.05872678756713867 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,True,True,Tests_passed,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,True,13,15,494,2,True,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,True,13,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,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,036ebedac33fd74fe34e9e4c7fb298b0f971fab42534668a202256e19604c57f,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,Tests_passed,9a4630fbdea4cfe47c5c3c134a9067b4168f4897779d771af92f4af549bf0096,0.03695416450500488,0.03446793556213379,0.04493856430053711,0.015329599380493164,0.0479588508605957,0.04027962684631348,0.0364227294921875,0.16062402725219727,0.10717511177062988,0.8181695938110352,0.3046095371246338,0.032118797302246094,0.059342384338378906,0.03151869773864746,0.0584561824798584,0.05872678756713867,0.05879092216491699,0.056989431381225586,0.059210777282714844,0.06029105186462402,0.06008172035217285,0.05816769599914551,0.06049942970275879,0.09279847145080566,0.09045529365539551,0.9240827560424805,0.35749268531799316,0.059903860092163086,0.059998512268066406,0.06038475036621094,0.059606075286865234,0.05927085876464844 diff --git a/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv b/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv index b718de042f..5f8b7b6b67 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,True,True,True,3,12,37,2,True,3,Tests_passed,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,True,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,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,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,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,2a31c402df6a8f178a8f03b56cc26a1b37a76f486780f9cc7f2ac4e444ecd8f7,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,0.031856536865234375,0.04558539390563965,0.03905224800109863,0.0271759033203125,0.02948760986328125,0.05935382843017578,0.024600982666015625,0.1719648838043213,0.10637426376342773,0.8127665519714355,0.2796182632446289,0.04693865776062012,0.07053256034851074,0.04790043830871582,0.0721747875213623,0.07218456268310547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,True,True,True,3,12,37,2,True,3,Tests_passed,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,True,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,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,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,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,2a31c402df6a8f178a8f03b56cc26a1b37a76f486780f9cc7f2ac4e444ecd8f7,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,0.031856536865234375,0.04558539390563965,0.03905224800109863,0.0271759033203125,0.02948760986328125,0.05935382843017578,0.024600982666015625,0.1719648838043213,0.10637426376342773,0.8127665519714355,0.2796182632446289,0.04693865776062012,0.07053256034851074,0.04790043830871582,0.0721747875213623,0.07218456268310547,0.06673955917358398,0.06939411163330078,0.06982707977294922,0.07311320304870605,0.06893587112426758,0.0699911117553711,0.07131695747375488,0.10804605484008789,0.10025954246520996,0.8807456493377686,0.3177053928375244,0.06782388687133789,0.06662344932556152,0.06865477561950684,0.06763863563537598,0.06663870811462402 diff --git a/results/combined/merges_timed/pragmatists/junitparams.csv b/results/combined/merges_timed/pragmatists/junitparams.csv index 937736c483..ac25dceefe 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -46,refs/heads/master,8f6c13ae04b9f525f36e55c1dd881be14a246b59,4c5658534e52bb9da9b8d56d6c36890a91e21db3,1e33e02a72bcdee753a5bffcc10d4a35b75c2199,,True,True,True,18,102,883.0,2,True,18,Tests_passed,a216f59d9eeb40209d459cfaf936509e52c81c7b6c6a0a73067acc5b38c7f271,True,Tests_passed,531693458bda96633abc2bedb8b04c3219da1f1dbfbd0789218188866fdba637,True,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,54f80524f28c3de9444dc5fa7e8ecfdf34ef0e4ee20a3bb6fc8e997dfbeba2b7,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Tests_failed,8343367efe18f253b6c4f3afa1e35b1b12ba87a230f2a1625d113aacba707381,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,8c59456b672ad6f11fb1e05c396e5834018ba4e617162600f85389b336e3a7bc,Tests_passed,ae808252221625ff19e94f2cec966062d35abdd29ec5bf55a2e917813db22c9d,Tests_passed,0fca962f35559536760c603f88c231ef2a2da907c0c4c80153bfd17b4c92c004,Tests_failed,8343367efe18f253b6c4f3afa1e35b1b12ba87a230f2a1625d113aacba707381,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,0.04014158248901367,0.01605701446533203,0.0214688777923584,0.023802995681762695,0.04335331916809082,0.039109230041503906,0.04449963569641113,0.15265321731567383,0.1311655044555664,0.5802152156829834,0.5229718685150146,0.05049753189086914,0.051779985427856445,0.049738168716430664,0.048581838607788086,0.04840803146362305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +46,refs/heads/master,8f6c13ae04b9f525f36e55c1dd881be14a246b59,4c5658534e52bb9da9b8d56d6c36890a91e21db3,1e33e02a72bcdee753a5bffcc10d4a35b75c2199,,True,True,True,18,102,883.0,2,True,18,Tests_passed,a216f59d9eeb40209d459cfaf936509e52c81c7b6c6a0a73067acc5b38c7f271,True,Tests_passed,531693458bda96633abc2bedb8b04c3219da1f1dbfbd0789218188866fdba637,True,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,54f80524f28c3de9444dc5fa7e8ecfdf34ef0e4ee20a3bb6fc8e997dfbeba2b7,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Tests_failed,8343367efe18f253b6c4f3afa1e35b1b12ba87a230f2a1625d113aacba707381,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,8c59456b672ad6f11fb1e05c396e5834018ba4e617162600f85389b336e3a7bc,Tests_passed,ae808252221625ff19e94f2cec966062d35abdd29ec5bf55a2e917813db22c9d,Tests_passed,0fca962f35559536760c603f88c231ef2a2da907c0c4c80153bfd17b4c92c004,Tests_failed,8343367efe18f253b6c4f3afa1e35b1b12ba87a230f2a1625d113aacba707381,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,0.04014158248901367,0.01605701446533203,0.0214688777923584,0.023802995681762695,0.04335331916809082,0.039109230041503906,0.04449963569641113,0.15265321731567383,0.1311655044555664,0.5802152156829834,0.5229718685150146,0.05049753189086914,0.051779985427856445,0.049738168716430664,0.048581838607788086,0.04840803146362305,0.050559043884277344,0.05124044418334961,0.05238819122314453,0.053473711013793945,0.05119776725769043,0.052779197692871094,0.050582170486450195,0.08502006530761719,0.11150336265563965,0.7089910507202148,0.6203734874725342,0.04882621765136719,0.050295352935791016,0.050803422927856445,0.05125164985656738,0.052051544189453125 diff --git a/results/combined/merges_timed/premium-minds/billy.csv b/results/combined/merges_timed/premium-minds/billy.csv index 798f8570e2..583949323f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,False,True,10,18,62.0,4,True,10,Tests_passed,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,True,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,True,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,d38e724c75ea70dfe66f364840fafce96be86f7b510c74d50f9701979bb37c66,Tests_failed,2f26d4ed0d170d1648ef5697a78dfe3fe8bcd50cf835f3664487a3355590bb92,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,0.017379283905029297,0.01732778549194336,0.019989728927612305,0.028553247451782227,0.01982426643371582,0.02013230323791504,0.020589351654052734,0.08220624923706055,0.1791839599609375,5.928813934326172,0.8155767917633057,0.052861690521240234,0.14513230323791504,0.05523180961608887,0.14792656898498535,0.14378905296325684 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,False,True,10,18,62.0,4,True,10,Tests_passed,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,True,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,True,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,d38e724c75ea70dfe66f364840fafce96be86f7b510c74d50f9701979bb37c66,Tests_failed,2f26d4ed0d170d1648ef5697a78dfe3fe8bcd50cf835f3664487a3355590bb92,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,0.017379283905029297,0.01732778549194336,0.019989728927612305,0.028553247451782227,0.01982426643371582,0.02013230323791504,0.020589351654052734,0.08220624923706055,0.1791839599609375,5.928813934326172,0.8155767917633057,0.052861690521240234,0.14513230323791504,0.05523180961608887,0.14792656898498535,0.14378905296325684,0.1346595287322998,0.13341999053955078,0.1345531940460205,0.13892292976379395,0.13762307167053223,0.13741731643676758,0.14432096481323242,0.21210289001464844,0.2146158218383789,6.159946918487549,0.804894208908081,0.13362503051757812,0.13338303565979004,0.1343553066253662,0.1351008415222168,0.13366079330444336 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 fe2ab06750..501c0bd64b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,True,83,108,589,106,True,184,Tests_passed,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,True,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,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,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,46539537bcfb263eaf8340f61ded0d988f6e1fd35c5f0db95706aa4b3ed1a6b6,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,0.02253890037536621,0.022507429122924805,0.024704456329345703,0.03199648857116699,0.01761770248413086,0.02482008934020996,0.024268388748168945,0.08472084999084473,0.24028968811035156,1.3886172771453857,0.6472272872924805,0.06130695343017578,0.11606526374816895,0.08051753044128418,0.15322494506835938,0.1328129768371582 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,True,83,108,589,106,True,184,Tests_passed,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,True,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,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,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,46539537bcfb263eaf8340f61ded0d988f6e1fd35c5f0db95706aa4b3ed1a6b6,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,Tests_passed,2849e20ed8419afa37e23719af3de3fe524e4c6684d80df9c9140a2fc48f95e0,0.02253890037536621,0.022507429122924805,0.024704456329345703,0.03199648857116699,0.01761770248413086,0.02482008934020996,0.024268388748168945,0.08472084999084473,0.24028968811035156,1.3886172771453857,0.6472272872924805,0.06130695343017578,0.11606526374816895,0.08051753044128418,0.15322494506835938,0.1328129768371582,0.14893507957458496,0.12950539588928223,0.15556073188781738,0.1313467025756836,0.15003132820129395,0.128068208694458,0.15532851219177246,0.21425890922546387,0.2464137077331543,1.7497944831848145,0.8465604782104492,0.15459418296813965,0.12830662727355957,0.1476740837097168,0.1303553581237793,0.14801311492919922 diff --git a/results/combined/merges_timed/prism/prism-bukkit.csv b/results/combined/merges_timed/prism/prism-bukkit.csv index d70fc157d5..ca3bf6bdce 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,True,True,True,29,173,876,5,True,29,Tests_passed,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,True,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,20cd8c3dbfbc20b89c48c1b9a16db1015d5210dc6fb4de56c7e22cf6802b532e,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,feed1ab5e642c6304f52cad597261d8845efe6193f073ed612775bb10eb89e57,Merge_failed,0f60c52fd44f0fd75ce63c42883c1762f1b12e8badcc0345ff2cde4ef265982b,Tests_failed,77a687a0b23c18d0086ee98ac2e20d2dbedb6d48f78d88ed6e272f23f664323a,Tests_failed,9f0a7251fd976f06bd3a47171eacf67477e4fb9134dc5c82e2480ddc356aa1e7,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,0.017651081085205078,0.01960158348083496,0.019744157791137695,0.035958051681518555,0.019907236099243164,0.019655942916870117,0.02040576934814453,0.0937964916229248,0.2356414794921875,3.619046926498413,0.8238646984100342,0.05991721153259277,0.12601757049560547,0.048157691955566406,0.1213383674621582,0.1507859230041504 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,True,True,True,29,173,876,5,True,29,Tests_passed,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,True,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,20cd8c3dbfbc20b89c48c1b9a16db1015d5210dc6fb4de56c7e22cf6802b532e,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,feed1ab5e642c6304f52cad597261d8845efe6193f073ed612775bb10eb89e57,Merge_failed,0f60c52fd44f0fd75ce63c42883c1762f1b12e8badcc0345ff2cde4ef265982b,Tests_failed,77a687a0b23c18d0086ee98ac2e20d2dbedb6d48f78d88ed6e272f23f664323a,Tests_failed,9f0a7251fd976f06bd3a47171eacf67477e4fb9134dc5c82e2480ddc356aa1e7,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Merge_failed,3c927e67f6467e6511002c0519780924f40b369fafbd59e136887e7d3925a4ca,Tests_failed,9557223dc36ef57f81158aa991bc5ca26bd4d0c0fe647c89db8797da744eb8b4,0.017651081085205078,0.01960158348083496,0.019744157791137695,0.035958051681518555,0.019907236099243164,0.019655942916870117,0.02040576934814453,0.0937964916229248,0.2356414794921875,3.619046926498413,0.8238646984100342,0.05991721153259277,0.12601757049560547,0.048157691955566406,0.1213383674621582,0.1507859230041504,0.12784624099731445,0.13675308227539062,0.1344311237335205,0.15733861923217773,0.13460874557495117,0.1201934814453125,0.13108134269714355,0.20584774017333984,0.24297738075256348,4.403929948806763,1.0429840087890625,0.13014698028564453,0.12087416648864746,0.12438392639160156,0.12935209274291992,0.1531977653503418 diff --git a/results/combined/merges_timed/progether/jadventure.csv b/results/combined/merges_timed/progether/jadventure.csv index 78e7288773..3a6fa6f807 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,Tests_passed,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,True,3,2,3,2,True,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,True,3,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,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,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,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,c2729a1743dce3f77d9b7d661432bdfa087ada2d5909edcf631abcbe8f4d2f48,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,0.012983322143554688,0.012844562530517578,0.014133930206298828,0.01974964141845703,0.014107465744018555,0.014664173126220703,0.014070987701416016,0.042209625244140625,0.07049870491027832,0.8336226940155029,0.2818732261657715,0.03971600532531738,0.06373763084411621,0.039420127868652344,0.06299471855163574,0.062330007553100586 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,Tests_passed,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,True,3,2,3,2,True,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,True,3,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,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,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,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,c2729a1743dce3f77d9b7d661432bdfa087ada2d5909edcf631abcbe8f4d2f48,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,0.012983322143554688,0.012844562530517578,0.014133930206298828,0.01974964141845703,0.014107465744018555,0.014664173126220703,0.014070987701416016,0.042209625244140625,0.07049870491027832,0.8336226940155029,0.2818732261657715,0.03971600532531738,0.06373763084411621,0.039420127868652344,0.06299471855163574,0.062330007553100586,0.061078786849975586,0.05920600891113281,0.06053352355957031,0.06360411643981934,0.05255842208862305,0.06191825866699219,0.0630035400390625,0.09841132164001465,0.0861978530883789,0.8477177619934082,0.32802891731262207,0.06120657920837402,0.05983471870422363,0.0626521110534668,0.059866905212402344,0.06046772003173828 diff --git a/results/combined/merges_timed/projectblueshift/blueshiftapi.csv b/results/combined/merges_timed/projectblueshift/blueshiftapi.csv index 5435d5ea5f..6ce1b37e90 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,bfa1e8aa40e753153e46b2d691719e1b2bd8af6f4fb08d67a570dbc7c66b35a7,Merge_failed,6993c3ef798a42e596dee2de687394ff7e30b5d3a6b4a2943c0c662214b4b463,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,0.047301292419433594,0.04222846031188965,0.04514932632446289,0.024435758590698242,0.03235435485839844,0.045581817626953125,0.046633243560791016,0.34291505813598633,0.29395461082458496,1.6473522186279297,0.3763124942779541,0.07668781280517578,0.07547473907470703,0.07764077186584473,0.08179497718811035,0.08215618133544922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,bfa1e8aa40e753153e46b2d691719e1b2bd8af6f4fb08d67a570dbc7c66b35a7,Merge_failed,6993c3ef798a42e596dee2de687394ff7e30b5d3a6b4a2943c0c662214b4b463,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,0.047301292419433594,0.04222846031188965,0.04514932632446289,0.024435758590698242,0.03235435485839844,0.045581817626953125,0.046633243560791016,0.34291505813598633,0.29395461082458496,1.6473522186279297,0.3763124942779541,0.07668781280517578,0.07547473907470703,0.07764077186584473,0.08179497718811035,0.08215618133544922,0.08086514472961426,0.08004260063171387,0.08288335800170898,0.08068060874938965,0.08258867263793945,0.08112144470214844,0.07491850852966309,0.16668272018432617,0.20610880851745605,1.779029130935669,0.4830007553100586,0.07909536361694336,0.0822453498840332,0.07783651351928711,0.07968616485595703,0.07997465133666992 diff --git a/results/combined/merges_timed/projectdanube/xdi2.csv b/results/combined/merges_timed/projectdanube/xdi2.csv index b66fe3fa1e..dc610974a5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -53,refs/heads/master,e9b5fa658b6b5429239c768233df8b2134740542,aa25d13cf1e1149ae2ead3b868a9ddbf904248d9,f0c3462c6222bfac8e95801e772edc20d7af740e,,True,True,True,35,106,356.0,2,True,35,Tests_passed,7a21ef5e8f6497e2c7fdbf2e055f79219ba718fc6779192fdba7350e0738a779,True,Tests_passed,af50781b94a9a3e1e6d431f0ba405fc4102e578b58552273829b0e0d4f452301,True,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,a4a13c0de15dc667130c1c7d9c83116bf8e31ccef45a1b820554a5fb23d4a455,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Tests_failed,e8a795ce8f4c3561b04e159a31ed7e96c819056906d3d78a4db0884c466ebfcc,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,38cf679fbd20018fb9fc177812a0cf16d2d3a8a7ba40c0bf9bd00666ed3515f2,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,c22978003e8f05e493eae830839d54cc8f9f30e8933d575b9b495cf932599842,Tests_failed,e8a795ce8f4c3561b04e159a31ed7e96c819056906d3d78a4db0884c466ebfcc,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,0.054694414138793945,0.05677056312561035,0.05607295036315918,0.02376389503479004,0.0504155158996582,0.05533456802368164,0.055222511291503906,0.22943449020385742,0.12304878234863281,0.8093924522399902,1.017552137374878,0.051207780838012695,0.05274462699890137,0.053072214126586914,0.05356955528259277,0.05442404747009277 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +53,refs/heads/master,e9b5fa658b6b5429239c768233df8b2134740542,aa25d13cf1e1149ae2ead3b868a9ddbf904248d9,f0c3462c6222bfac8e95801e772edc20d7af740e,,True,True,True,35,106,356.0,2,True,35,Tests_passed,7a21ef5e8f6497e2c7fdbf2e055f79219ba718fc6779192fdba7350e0738a779,True,Tests_passed,af50781b94a9a3e1e6d431f0ba405fc4102e578b58552273829b0e0d4f452301,True,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,a4a13c0de15dc667130c1c7d9c83116bf8e31ccef45a1b820554a5fb23d4a455,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Tests_failed,e8a795ce8f4c3561b04e159a31ed7e96c819056906d3d78a4db0884c466ebfcc,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,38cf679fbd20018fb9fc177812a0cf16d2d3a8a7ba40c0bf9bd00666ed3515f2,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,c22978003e8f05e493eae830839d54cc8f9f30e8933d575b9b495cf932599842,Tests_failed,e8a795ce8f4c3561b04e159a31ed7e96c819056906d3d78a4db0884c466ebfcc,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,0.054694414138793945,0.05677056312561035,0.05607295036315918,0.02376389503479004,0.0504155158996582,0.05533456802368164,0.055222511291503906,0.22943449020385742,0.12304878234863281,0.8093924522399902,1.017552137374878,0.051207780838012695,0.05274462699890137,0.053072214126586914,0.05356955528259277,0.05442404747009277,0.05056428909301758,0.05006837844848633,0.05135488510131836,0.04899930953979492,0.049718379974365234,0.04956531524658203,0.04914975166320801,0.08505773544311523,0.10895967483520508,0.8222007751464844,1.0712950229644775,0.05039191246032715,0.04935717582702637,0.05125737190246582,0.049453020095825195,0.050237417221069336 diff --git a/results/combined/merges_timed/projectkorra/projectkorra.csv b/results/combined/merges_timed/projectkorra/projectkorra.csv index 9fdb4698f8..1a4d151da8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -701,refs/remotes/origin/pull/961,dd6d1252c9301ab42113fcc18f215eaf8fc6eb96,a9c8c47cda20149f10db486d3dfb5139641864e7,b05b5122854df1818e39515742d15f11e6b840b3,,True,True,True,36,288,982,5,True,37,Tests_passed,a3895f4dba5e6155d6dc6c8b3f8a24d02d919068a4e4ec3f9e47278474667bec,True,Tests_passed,2f57d90a2ea360bb259e42f77de2bbc42c9ecc1c363a8bab42c7d8b06c05d6a7,True,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,1e3eefa444cac9650ef808c1496cec3df1b168fb787878f641722e16bebf01cf,Merge_failed,9bdc46bafddb9255d92de52d9ccf7988795dbba25f31ff5e8e09c7df82c365d5,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Tests_failed,a017d6613cb664953eed07bfb30e06ddb577558e62a5006d847f2ed8a77a02e2,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,5bdafd788e63b263f4287dff8cb75e9060dacc00efdafa6c33bf1992fc181aa0,Merge_failed,5bdafd788e63b263f4287dff8cb75e9060dacc00efdafa6c33bf1992fc181aa0,Merge_failed,13855563af67ec23df4559d586788b2a36cb202a6bb6e5512f438819ea5208bd,Merge_failed,9951d93f8416236130ec125f872be97b68c51c4846f307952dabc134604a2588,Merge_failed,616bc192cf2862db8a7a6f48712a3db97195fb469aa747e3b8850092e377b5bb,Merge_failed,8b5321f73aa48e058aea7f89972409d610f48ce3713cc841ac1c99750c510826,Tests_failed,102ef91bc59f142ede470e6a444ff08e84419c71c4611c436248b083b6b9594a,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,0.032308101654052734,0.02655315399169922,0.025826692581176758,0.029401063919067383,0.031633853912353516,0.03948259353637695,0.024959802627563477,0.3701155185699463,0.21459197998046875,3.6153440475463867,1.437159776687622,0.06795907020568848,0.23660659790039062,0.08533239364624023,0.12988638877868652,0.11374306678771973 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +701,refs/remotes/origin/pull/961,dd6d1252c9301ab42113fcc18f215eaf8fc6eb96,a9c8c47cda20149f10db486d3dfb5139641864e7,b05b5122854df1818e39515742d15f11e6b840b3,,True,True,True,36,288,982,5,True,37,Tests_passed,a3895f4dba5e6155d6dc6c8b3f8a24d02d919068a4e4ec3f9e47278474667bec,True,Tests_passed,2f57d90a2ea360bb259e42f77de2bbc42c9ecc1c363a8bab42c7d8b06c05d6a7,True,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,1e3eefa444cac9650ef808c1496cec3df1b168fb787878f641722e16bebf01cf,Merge_failed,9bdc46bafddb9255d92de52d9ccf7988795dbba25f31ff5e8e09c7df82c365d5,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Tests_failed,a017d6613cb664953eed07bfb30e06ddb577558e62a5006d847f2ed8a77a02e2,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,Merge_failed,5bdafd788e63b263f4287dff8cb75e9060dacc00efdafa6c33bf1992fc181aa0,Merge_failed,5bdafd788e63b263f4287dff8cb75e9060dacc00efdafa6c33bf1992fc181aa0,Merge_failed,13855563af67ec23df4559d586788b2a36cb202a6bb6e5512f438819ea5208bd,Merge_failed,9951d93f8416236130ec125f872be97b68c51c4846f307952dabc134604a2588,Merge_failed,616bc192cf2862db8a7a6f48712a3db97195fb469aa747e3b8850092e377b5bb,Merge_failed,8b5321f73aa48e058aea7f89972409d610f48ce3713cc841ac1c99750c510826,Tests_failed,102ef91bc59f142ede470e6a444ff08e84419c71c4611c436248b083b6b9594a,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,73708e727cfb99fc762597bbd055142111b89c5fd95193e6eb97165365d891e8,Merge_failed,de35d12e2e8c5f6530cc900484531140f4fe376691c96fa0673f9ef1b2151ae4,0.032308101654052734,0.02655315399169922,0.025826692581176758,0.029401063919067383,0.031633853912353516,0.03948259353637695,0.024959802627563477,0.3701155185699463,0.21459197998046875,3.6153440475463867,1.437159776687622,0.06795907020568848,0.23660659790039062,0.08533239364624023,0.12988638877868652,0.11374306678771973,0.1316697597503662,0.11648344993591309,0.1383686065673828,0.11602377891540527,0.16358494758605957,0.15222382545471191,0.16058969497680664,0.23327374458312988,0.25923585891723633,4.120862007141113,1.828991413116455,0.13579511642456055,0.13747525215148926,0.13177275657653809,0.13560914993286133,0.10900259017944336 diff --git a/results/combined/merges_timed/ptgoetz/storm-hdfs.csv b/results/combined/merges_timed/ptgoetz/storm-hdfs.csv index f300da1eb1..b418ee11b9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,True,9,48,315,4,True,9,Tests_passed,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,True,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,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,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,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,dc8639e9025759c57271992a631a5af69ff96652afa7f51c726bb5e548422a71,Tests_failed,10b965f1639ec64157a12b2a23e36607b60159c6f06c88fbf91c345d870bf3c3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,0.03601527214050293,0.04451775550842285,0.041697025299072266,0.017796039581298828,0.04684734344482422,0.048070430755615234,0.04725837707519531,0.2977323532104492,0.2156987190246582,1.6960506439208984,0.3498821258544922,0.03354358673095703,0.09160280227661133,0.03258466720581055,0.09148979187011719,0.09255146980285645 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,True,9,48,315,4,True,9,Tests_passed,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,True,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,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,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,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,dc8639e9025759c57271992a631a5af69ff96652afa7f51c726bb5e548422a71,Tests_failed,10b965f1639ec64157a12b2a23e36607b60159c6f06c88fbf91c345d870bf3c3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,0.03601527214050293,0.04451775550842285,0.041697025299072266,0.017796039581298828,0.04684734344482422,0.048070430755615234,0.04725837707519531,0.2977323532104492,0.2156987190246582,1.6960506439208984,0.3498821258544922,0.03354358673095703,0.09160280227661133,0.03258466720581055,0.09148979187011719,0.09255146980285645,0.09345197677612305,0.09256577491760254,0.09447813034057617,0.09476876258850098,0.09153461456298828,0.09144973754882812,0.09234189987182617,0.16086530685424805,0.1743762493133545,2.0738728046417236,0.39899682998657227,0.09148144721984863,0.09498453140258789,0.09287190437316895,0.09174060821533203,0.09372878074645996 diff --git a/results/combined/merges_timed/pydio/pydio-sdk-java.csv b/results/combined/merges_timed/pydio/pydio-sdk-java.csv index 8a56f7fcaf..c336833e89 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,True,False,Tests_passed,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,True,4,19,69,2,True,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,True,4,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,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,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,f7a18c9d6059aba15b6d8668d09bbbeb03d6ec5a6bc68567cdd2d4c667b4736d,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,0.03952503204345703,0.037337303161621094,0.0434873104095459,0.016230344772338867,0.0398409366607666,0.04028034210205078,0.04524064064025879,0.17040705680847168,0.11426711082458496,1.32769775390625,0.3493971824645996,0.03192257881164551,0.05915498733520508,0.031104326248168945,0.0585024356842041,0.06108856201171875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,True,False,Tests_passed,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,True,4,19,69,2,True,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,True,4,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,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,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,f7a18c9d6059aba15b6d8668d09bbbeb03d6ec5a6bc68567cdd2d4c667b4736d,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,0.03952503204345703,0.037337303161621094,0.0434873104095459,0.016230344772338867,0.0398409366607666,0.04028034210205078,0.04524064064025879,0.17040705680847168,0.11426711082458496,1.32769775390625,0.3493971824645996,0.03192257881164551,0.05915498733520508,0.031104326248168945,0.0585024356842041,0.06108856201171875,0.06188654899597168,0.060585737228393555,0.06346249580383301,0.060875654220581055,0.062291860580444336,0.06256914138793945,0.06335711479187012,0.09853410720825195,0.09722733497619629,1.5681471824645996,0.42800354957580566,0.06071281433105469,0.06103205680847168,0.06094622611999512,0.060411930084228516,0.0629889965057373 diff --git a/results/combined/merges_timed/pyknic/codegen.csv b/results/combined/merges_timed/pyknic/codegen.csv index 3f90b34223..d579568e79 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,True,True,Tests_passed,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,True,146,1034,5810,25,True,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,True,152,True,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,51c0153f0de5a337c6a1fb9546b38866dd97633fb2f59242f83cfa6a891fa731,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Tests_failed,3c4f902f354f00a3f8f3ca65277c63a22ddc50d4e35da6e2870a816b99ccec8a,Merge_failed,0b97993d9608976db7a72546d2a614e1f2bd8e351bbf6c7f197cc20120523ec6,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,c3ff6c4ac9c181eb5103df7268861575beb8a5152cccda4717e2820bbd886a15,Merge_failed,e76bddd91030e5d27778ee291f5b3db36d2874a12fe4858f65229708fff5396c,Merge_failed,e76bddd91030e5d27778ee291f5b3db36d2874a12fe4858f65229708fff5396c,Merge_failed,dba525d942fae18f82bff1159d88c8ad1aae5a1e399d3d33458c2f9983fd217f,Merge_failed,8208a4b4cc41c592fdfc573596a4c8da49fce20f1ab8537a0a298cbc29ae75b7,Merge_failed,1dabcd435c99f255be657d3d9706aa40d08fc060ca2b0f4bf0b1f6c7d077ee99,Merge_failed,5c74d13748acac502d4933a74f011f3bebe8221288507da0daacd32a6175b585,Tests_failed,773bca0f02c643b9e83c6093182772fa2a5e248676cc6d47a3711ede57b0b0a0,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,0.03583264350891113,0.03908681869506836,0.019222259521484375,0.024588823318481445,0.01874256134033203,0.0185849666595459,0.018709421157836914,0.8446898460388184,1.1810507774353027,10.156453371047974,1.1525278091430664,0.16250324249267578,0.3312563896179199,0.1556384563446045,0.3354175090789795,0.3456909656524658 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,True,True,Tests_passed,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,True,146,1034,5810,25,True,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,True,152,True,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,51c0153f0de5a337c6a1fb9546b38866dd97633fb2f59242f83cfa6a891fa731,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Tests_failed,3c4f902f354f00a3f8f3ca65277c63a22ddc50d4e35da6e2870a816b99ccec8a,Merge_failed,0b97993d9608976db7a72546d2a614e1f2bd8e351bbf6c7f197cc20120523ec6,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,c3ff6c4ac9c181eb5103df7268861575beb8a5152cccda4717e2820bbd886a15,Merge_failed,e76bddd91030e5d27778ee291f5b3db36d2874a12fe4858f65229708fff5396c,Merge_failed,e76bddd91030e5d27778ee291f5b3db36d2874a12fe4858f65229708fff5396c,Merge_failed,dba525d942fae18f82bff1159d88c8ad1aae5a1e399d3d33458c2f9983fd217f,Merge_failed,8208a4b4cc41c592fdfc573596a4c8da49fce20f1ab8537a0a298cbc29ae75b7,Merge_failed,1dabcd435c99f255be657d3d9706aa40d08fc060ca2b0f4bf0b1f6c7d077ee99,Merge_failed,5c74d13748acac502d4933a74f011f3bebe8221288507da0daacd32a6175b585,Tests_failed,773bca0f02c643b9e83c6093182772fa2a5e248676cc6d47a3711ede57b0b0a0,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d05f56a6f065dd1dc86b45398e45a8ef2230270d58d41386ac19aee05fa29a23,Merge_failed,d17634d83d5b51293db4e6684d08e784208665b9f15b8d628a4bae10cd8e800b,0.03583264350891113,0.03908681869506836,0.019222259521484375,0.024588823318481445,0.01874256134033203,0.0185849666595459,0.018709421157836914,0.8446898460388184,1.1810507774353027,10.156453371047974,1.1525278091430664,0.16250324249267578,0.3312563896179199,0.1556384563446045,0.3354175090789795,0.3456909656524658,0.3153822422027588,0.32393908500671387,0.32012462615966797,0.3238973617553711,0.3203463554382324,0.3131067752838135,0.31301403045654297,0.6448812484741211,0.814239501953125,10.205564498901367,1.5358185768127441,0.3181023597717285,0.3168201446533203,0.3190493583679199,0.31529927253723145,0.3284423351287842 diff --git a/results/combined/merges_timed/qcadoo/mes.csv b/results/combined/merges_timed/qcadoo/mes.csv index ca33cb7874..fb94ea8b85 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,True,15,29,140.0,2,True,15,Tests_passed,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,True,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,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,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,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,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,ce6a7b217edca1396c5dde97ef821268820c751a8bc8af113c5158588d8debc1,Tests_failed,1da8ffc1585372d8f6e097e4ca2fed81abcaf47f4c1f6c6296a6581d4136232e,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,0.01837301254272461,0.011696577072143555,0.02417898178100586,0.017894744873046875,0.023353099822998047,0.02355027198791504,0.011115074157714844,0.05362439155578613,0.07412385940551758,0.8565731048583984,0.5020146369934082,0.058762311935424805,0.062105417251586914,0.058028459548950195,0.08503365516662598,0.06560540199279785 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,True,15,29,140.0,2,True,15,Tests_passed,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,True,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,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,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,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,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,ce6a7b217edca1396c5dde97ef821268820c751a8bc8af113c5158588d8debc1,Tests_failed,1da8ffc1585372d8f6e097e4ca2fed81abcaf47f4c1f6c6296a6581d4136232e,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,0.01837301254272461,0.011696577072143555,0.02417898178100586,0.017894744873046875,0.023353099822998047,0.02355027198791504,0.011115074157714844,0.05362439155578613,0.07412385940551758,0.8565731048583984,0.5020146369934082,0.058762311935424805,0.062105417251586914,0.058028459548950195,0.08503365516662598,0.06560540199279785,0.059865474700927734,0.08371877670288086,0.05971837043762207,0.08640885353088379,0.05998706817626953,0.08692526817321777,0.06004977226257324,0.1282486915588379,0.09026932716369629,0.9365441799163818,0.5478827953338623,0.08166170120239258,0.08303689956665039,0.07323575019836426,0.08245444297790527,0.0705709457397461 diff --git a/results/combined/merges_timed/qihoo360/xlearning.csv b/results/combined/merges_timed/qihoo360/xlearning.csv index 40b4fcb130..05c5389a05 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,True,9,14,67,2,True,9,Tests_passed,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,True,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,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,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,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,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,5ae481839ff7da1532f26f23bc07169d569cfd209d7fbd62c18a5087b50e8ee4,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.01889824867248535,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.12756013870239258,2.479236125946045,0.6234662532806396,0.03376436233520508,0.06800222396850586,0.03500676155090332,0.0671687126159668,0.06502485275268555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,True,9,14,67,2,True,9,Tests_passed,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,True,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,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,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,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,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,5ae481839ff7da1532f26f23bc07169d569cfd209d7fbd62c18a5087b50e8ee4,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.01889824867248535,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.12756013870239258,2.479236125946045,0.6234662532806396,0.03376436233520508,0.06800222396850586,0.03500676155090332,0.0671687126159668,0.06502485275268555,0.06631588935852051,0.06278324127197266,0.06251955032348633,0.06689667701721191,0.06291842460632324,0.0638735294342041,0.0664222240447998,0.10551857948303223,0.10571026802062988,2.388047695159912,0.6729812622070312,0.06462359428405762,0.062230587005615234,0.06284189224243164,0.06758499145507812,0.06353044509887695 diff --git a/results/combined/merges_timed/qubole/presto-udfs.csv b/results/combined/merges_timed/qubole/presto-udfs.csv index e44a4b61d2..a531e73c62 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,True,2,11,111,5,True,5,Tests_passed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,True,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,True,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,0.007806301116943359,0.008121252059936523,0.007941007614135742,0.012389659881591797,0.007650613784790039,0.007485389709472656,0.007800102233886719,0.03119635581970215,0.06455469131469727,0.6087543964385986,0.363067626953125,0.03105783462524414,0.03257894515991211,0.0309140682220459,0.031946659088134766,0.032822370529174805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,True,2,11,111,5,True,5,Tests_passed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,True,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,True,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,0.007806301116943359,0.008121252059936523,0.007941007614135742,0.012389659881591797,0.007650613784790039,0.007485389709472656,0.007800102233886719,0.03119635581970215,0.06455469131469727,0.6087543964385986,0.363067626953125,0.03105783462524414,0.03257894515991211,0.0309140682220459,0.031946659088134766,0.032822370529174805,0.03248882293701172,0.031981706619262695,0.0322418212890625,0.03212881088256836,0.032798051834106445,0.03134655952453613,0.03205680847167969,0.06424450874328613,0.06460738182067871,0.6649541854858398,0.3992624282836914,0.03293275833129883,0.03260922431945801,0.032234907150268555,0.031963348388671875,0.03220486640930176 diff --git a/results/combined/merges_timed/querydsl/apt-maven-plugin.csv b/results/combined/merges_timed/querydsl/apt-maven-plugin.csv index 40f17e8420..84e88d38bd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,True,4,14,70,2,True,4,Tests_passed,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,True,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,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,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,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,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,a11d690f04a8a0df129d9e1eca9c5e4c428d8a5761cb405986476cdb2fe84f08,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,0.039708852767944336,0.04330086708068848,0.04273343086242676,0.013932466506958008,0.04420661926269531,0.04340076446533203,0.04450249671936035,0.09470343589782715,0.09827828407287598,0.8316278457641602,0.32596349716186523,0.02975296974182129,0.05228257179260254,0.029421567916870117,0.051666259765625,0.05207943916320801 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,True,4,14,70,2,True,4,Tests_passed,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,True,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,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,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,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,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,a11d690f04a8a0df129d9e1eca9c5e4c428d8a5761cb405986476cdb2fe84f08,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,0.039708852767944336,0.04330086708068848,0.04273343086242676,0.013932466506958008,0.04420661926269531,0.04340076446533203,0.04450249671936035,0.09470343589782715,0.09827828407287598,0.8316278457641602,0.32596349716186523,0.02975296974182129,0.05228257179260254,0.029421567916870117,0.051666259765625,0.05207943916320801,0.053490638732910156,0.05174827575683594,0.05356192588806152,0.05349445343017578,0.052809953689575195,0.05306410789489746,0.053175926208496094,0.0848546028137207,0.08587384223937988,1.0026750564575195,0.3680601119995117,0.05286097526550293,0.053058624267578125,0.05185508728027344,0.05261635780334473,0.05309557914733887 diff --git a/results/combined/merges_timed/qunarcorp/qmq.csv b/results/combined/merges_timed/qunarcorp/qmq.csv index f6d4ab50c7..510f830c3e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,True,988,2973,40595.0,2,True,988,Tests_passed,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,True,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,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,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,7dc013d26934724f63b71882cd7f5b7d1d5a9119ff3d9e6972f4311ae0d3a461,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,526a658e542f10efb7c89343a7dc54e2a256fe8a413e20b941edbd076e938e16,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.09089350700378418,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.1692051887512207,0.6770317554473877,12.647403240203857,0.1255664825439453,0.13995933532714844,0.12296438217163086,0.13222050666809082,0.13775086402893066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,True,988,2973,40595.0,2,True,988,Tests_passed,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,True,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,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,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,7dc013d26934724f63b71882cd7f5b7d1d5a9119ff3d9e6972f4311ae0d3a461,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,526a658e542f10efb7c89343a7dc54e2a256fe8a413e20b941edbd076e938e16,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.09089350700378418,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.1692051887512207,0.6770317554473877,12.647403240203857,0.1255664825439453,0.13995933532714844,0.12296438217163086,0.13222050666809082,0.13775086402893066,0.12629294395446777,0.13185620307922363,0.1444389820098877,0.14530181884765625,0.14255023002624512,0.14420390129089355,0.14139080047607422,0.1726088523864746,0.24410772323608398,0.7880444526672363,13.109459638595581,0.12928247451782227,0.12743544578552246,0.1274268627166748,0.1295766830444336,0.12605762481689453 diff --git a/results/combined/merges_timed/quux00/simplecsv.csv b/results/combined/merges_timed/quux00/simplecsv.csv index 5796c9035e..1aa603d5b0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,True,78,361,16653,4,True,78,Tests_passed,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,True,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,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,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,Merge_failed,92621bfd13369cbda30e873876cadbba56a39ef56e1ca2ed54d864e6f20c1524,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,3749bea8099cb50cfd03df4c9cf35a6f74cf0edf6d8d6fb622411f5dd3d4d61a,Merge_failed,293b876c75869bc17bbd48c972014a83b4ec4a93ba484a2047865f17c36a7e48,Merge_failed,e36d830349a688b7adf3b270e5f5d00b949978bfbb50d6c5170553224a01c09d,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,0.05243182182312012,0.042519330978393555,0.06344962120056152,0.021602630615234375,0.05979609489440918,0.06010103225708008,0.03376460075378418,0.3076045513153076,0.23326587677001953,0.7271168231964111,1.2778587341308594,0.08508801460266113,0.07601666450500488,0.0827021598815918,0.10186624526977539,0.09716033935546875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,True,78,361,16653,4,True,78,Tests_passed,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,True,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,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,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,Merge_failed,92621bfd13369cbda30e873876cadbba56a39ef56e1ca2ed54d864e6f20c1524,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,3749bea8099cb50cfd03df4c9cf35a6f74cf0edf6d8d6fb622411f5dd3d4d61a,Merge_failed,293b876c75869bc17bbd48c972014a83b4ec4a93ba484a2047865f17c36a7e48,Merge_failed,e36d830349a688b7adf3b270e5f5d00b949978bfbb50d6c5170553224a01c09d,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,8d108a0031731aaec7d322bc6528f0b401f59911129959dd2ef6159a0d7f19c5,Merge_failed,26a63dafaf8137eb04d39fe46e3fd233dcaee47ddcf510cddb1114fe65e2161b,0.05243182182312012,0.042519330978393555,0.06344962120056152,0.021602630615234375,0.05979609489440918,0.06010103225708008,0.03376460075378418,0.3076045513153076,0.23326587677001953,0.7271168231964111,1.2778587341308594,0.08508801460266113,0.07601666450500488,0.0827021598815918,0.10186624526977539,0.09716033935546875,0.10076665878295898,0.09344720840454102,0.10069680213928223,0.10333681106567383,0.09804344177246094,0.09549736976623535,0.0954439640045166,0.1610724925994873,0.2016434669494629,0.894395112991333,1.4248387813568115,0.09723806381225586,0.09903669357299805,0.0976572036743164,0.09359192848205566,0.09618139266967773 diff --git a/results/combined/merges_timed/rackerlabs/blueflood.csv b/results/combined/merges_timed/rackerlabs/blueflood.csv index 422c975d75..d66f1cee60 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,True,10,38,582.0,2,True,10,Tests_passed,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,True,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,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,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,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,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,3b8590b37daff7ac8d1493f5227498700ca72209e1938845ef9a368a0eb148a7,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,0.04640769958496094,0.04857301712036133,0.04402756690979004,0.019605159759521484,0.05599665641784668,0.05721306800842285,0.06047868728637695,0.18665623664855957,0.11330151557922363,0.8167831897735596,0.4580061435699463,0.03912091255187988,0.06551575660705566,0.03823709487915039,0.06586074829101562,0.06369566917419434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,True,10,38,582.0,2,True,10,Tests_passed,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,True,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,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,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,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,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,3b8590b37daff7ac8d1493f5227498700ca72209e1938845ef9a368a0eb148a7,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,0.04640769958496094,0.04857301712036133,0.04402756690979004,0.019605159759521484,0.05599665641784668,0.05721306800842285,0.06047868728637695,0.18665623664855957,0.11330151557922363,0.8167831897735596,0.4580061435699463,0.03912091255187988,0.06551575660705566,0.03823709487915039,0.06586074829101562,0.06369566917419434,0.06208324432373047,0.06491494178771973,0.06188488006591797,0.06594443321228027,0.06714653968811035,0.06272339820861816,0.06286931037902832,0.09854578971862793,0.09482574462890625,0.8762755393981934,0.47335219383239746,0.05983424186706543,0.06637907028198242,0.0626986026763916,0.06178116798400879,0.0624394416809082 diff --git a/results/combined/merges_timed/radkovo/cssbox.csv b/results/combined/merges_timed/radkovo/cssbox.csv index 44b45e7e77..6448913f42 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,True,True,True,14,77,585.0,6,True,14,Tests_passed,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,True,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,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_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_failed,e9d3bea3249aab7c858e287a00a4deab6b3b61301953fce60eb054a39bb8801e,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,0.061218976974487305,0.0532839298248291,0.05602717399597168,0.028555870056152344,0.04481959342956543,0.06633639335632324,0.045362234115600586,0.4381446838378906,0.32419896125793457,5.966154098510742,0.801293134689331,0.0516510009765625,0.17041873931884766,0.05071258544921875,0.1751708984375,0.17013096809387207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,True,True,True,14,77,585.0,6,True,14,Tests_passed,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,True,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,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_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_failed,e9d3bea3249aab7c858e287a00a4deab6b3b61301953fce60eb054a39bb8801e,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,c9d3bfd210541e74d9a9ed131bdbf86289580fba8be7541f07587b603dbdfeb7,Tests_passed,281fd123a6922ca14083d385584cab3b46813cb208a3518c4089a2b996b6be41,0.061218976974487305,0.0532839298248291,0.05602717399597168,0.028555870056152344,0.04481959342956543,0.06633639335632324,0.045362234115600586,0.4381446838378906,0.32419896125793457,5.966154098510742,0.801293134689331,0.0516510009765625,0.17041873931884766,0.05071258544921875,0.1751708984375,0.17013096809387207,0.17518258094787598,0.19211292266845703,0.1906280517578125,0.1920323371887207,0.18496036529541016,0.17076492309570312,0.18944644927978516,0.2936093807220459,0.32007765769958496,7.119093418121338,0.9302787780761719,0.18439936637878418,0.18293166160583496,0.17025184631347656,0.17262697219848633,0.1854398250579834 diff --git a/results/combined/merges_timed/radkovo/jstyleparser.csv b/results/combined/merges_timed/radkovo/jstyleparser.csv index 17bdea5442..f6b7506d99 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,Tests_passed,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,True,9,32,106.0,2,True,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,True,9,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,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,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,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,10d35c285e6d231b86571afc9705f24af531a8f9dad4103fe8324825a8095e85,Tests_failed,37aa617a68d414249e605e42cfe7baae438134acc4169db014e6f27a29f7efb5,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,0.038549184799194336,0.027960538864135742,0.04063081741333008,0.019350051879882812,0.04336857795715332,0.03191041946411133,0.01997685432434082,0.1706995964050293,0.11175680160522461,1.9421722888946533,0.6665534973144531,0.04970598220825195,0.0956730842590332,0.03644537925720215,0.09500861167907715,0.07427716255187988 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,Tests_passed,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,True,9,32,106.0,2,True,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,True,9,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,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,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,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,10d35c285e6d231b86571afc9705f24af531a8f9dad4103fe8324825a8095e85,Tests_failed,37aa617a68d414249e605e42cfe7baae438134acc4169db014e6f27a29f7efb5,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,0.038549184799194336,0.027960538864135742,0.04063081741333008,0.019350051879882812,0.04336857795715332,0.03191041946411133,0.01997685432434082,0.1706995964050293,0.11175680160522461,1.9421722888946533,0.6665534973144531,0.04970598220825195,0.0956730842590332,0.03644537925720215,0.09500861167907715,0.07427716255187988,0.09913825988769531,0.07067465782165527,0.09311079978942871,0.1110682487487793,0.07256841659545898,0.1125028133392334,0.07045912742614746,0.1665182113647461,0.11471915245056152,2.2238857746124268,0.7910640239715576,0.06778216361999512,0.09719967842102051,0.06894779205322266,0.09841585159301758,0.06810855865478516 diff --git a/results/combined/merges_timed/radsz/jacop.csv b/results/combined/merges_timed/radsz/jacop.csv index 8596caa7f9..c3b092afe1 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,Tests_passed,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,True,1951,6948,4410953,3,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,1951,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,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_timedout,,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,36d503f5f794acf2748824eb03253cab91f92caf45910d50d32712df984eb70c,Merge_failed,36d503f5f794acf2748824eb03253cab91f92caf45910d50d32712df984eb70c,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,de9deea5b8b3ff0bdf5ef9f4fdaaafee55f05e5b8d467989c88a09ccbe4b062d,Merge_failed,798472805629308ce64c35308cccf58f649b35760cbf675d05658eb5fbd97666,Merge_failed,7a3d879a4fef23d8f88b32d2972df01b10fee78060e74e7c43822fdc1665db24,Merge_timedout,,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,1.1856019496917725,1.2169826030731201,2.9726181030273438,2.1654348373413086,2.130396604537964,2.111809253692627,3.0532546043395996,1.9766581058502197,1.2829430103302002,3.1715314388275146,-1.0,1.2477126121520996,2.3549137115478516,1.28035306930542,2.3288252353668213,2.3807215690612793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,Tests_passed,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,True,1951,6948,4410953,3,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,1951,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,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_timedout,,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,Merge_failed,36d503f5f794acf2748824eb03253cab91f92caf45910d50d32712df984eb70c,Merge_failed,36d503f5f794acf2748824eb03253cab91f92caf45910d50d32712df984eb70c,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,de9deea5b8b3ff0bdf5ef9f4fdaaafee55f05e5b8d467989c88a09ccbe4b062d,Merge_failed,798472805629308ce64c35308cccf58f649b35760cbf675d05658eb5fbd97666,Merge_failed,7a3d879a4fef23d8f88b32d2972df01b10fee78060e74e7c43822fdc1665db24,Merge_timedout,,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Merge_failed,d6ac9a441964e41f58e5b2080c2dac3e92a112ab5b9d71d88b31e757c77a07d8,Tests_passed,bf2ba2f962b3ed6c443bac25c6d780578555f538047519df898b0ddf467dd05a,1.1856019496917725,1.2169826030731201,2.9726181030273438,2.1654348373413086,2.130396604537964,2.111809253692627,3.0532546043395996,1.9766581058502197,1.2829430103302002,3.1715314388275146,-1.0,1.2477126121520996,2.3549137115478516,1.28035306930542,2.3288252353668213,2.3807215690612793,2.2858943939208984,2.3046951293945312,3.1868436336517334,3.3054800033569336,3.2977445125579834,3.275503635406494,3.6045258045196533,2.39060115814209,2.9234426021575928,4.6617841720581055,-1.0,2.285719156265259,2.6960976123809814,2.260716676712036,2.2839088439941406,2.2932443618774414 diff --git a/results/combined/merges_timed/ralscha/embeddedtc.csv b/results/combined/merges_timed/ralscha/embeddedtc.csv index a0469050e1..c71dbd8bc7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,False,True,2,1,2,2,True,2,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,True,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,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,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,a667f29074b8db93614da26560695257c4d54e9bfaed30829b468f0ddb037675,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,0.03755521774291992,0.036257266998291016,0.0402987003326416,0.013305425643920898,0.033106327056884766,0.04208850860595703,0.04137539863586426,0.15802812576293945,0.08736753463745117,0.9598631858825684,0.2989387512207031,0.028070688247680664,0.053525686264038086,0.028035879135131836,0.0534517765045166,0.054041147232055664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,False,True,2,1,2,2,True,2,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,True,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,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,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,a667f29074b8db93614da26560695257c4d54e9bfaed30829b468f0ddb037675,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,Tests_passed,959be496f73d7640bad8eef179e27887d68ce89f6850113d3fbca9a54ffc0fda,0.03755521774291992,0.036257266998291016,0.0402987003326416,0.013305425643920898,0.033106327056884766,0.04208850860595703,0.04137539863586426,0.15802812576293945,0.08736753463745117,0.9598631858825684,0.2989387512207031,0.028070688247680664,0.053525686264038086,0.028035879135131836,0.0534517765045166,0.054041147232055664,0.05077528953552246,0.05113554000854492,0.05046558380126953,0.05121254920959473,0.05032634735107422,0.05122828483581543,0.0523529052734375,0.08283305168151855,0.08320760726928711,1.0039081573486328,0.3259289264678955,0.052459716796875,0.05216336250305176,0.051146745681762695,0.05073237419128418,0.05146980285644531 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 f6ad3f5074..299700941e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,Tests_passed,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,True,23,81,1030,4,True,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,True,23,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,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,c0ca74831e6f84f2829849ce7b32d24e8fd2891b2a871920090caa29350794f2,Tests_failed,ceec479905633bbe6068ea264c1bfc739263e6cd1c39cdb560f93d8d4185ebe4,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,0.07626962661743164,0.07617306709289551,0.07812213897705078,0.029280424118041992,0.07413959503173828,0.0799412727355957,0.07761764526367188,0.3223702907562256,0.24941277503967285,1.999312400817871,0.7541985511779785,0.0530240535736084,0.12252664566040039,0.055333852767944336,0.1211698055267334,0.12233090400695801 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,Tests_passed,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,True,23,81,1030,4,True,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,True,23,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,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,c0ca74831e6f84f2829849ce7b32d24e8fd2891b2a871920090caa29350794f2,Tests_failed,ceec479905633bbe6068ea264c1bfc739263e6cd1c39cdb560f93d8d4185ebe4,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,Tests_passed,ddf0869e7ef56a5f0cf6cab78151be7cc876041138c62a09757d2cb74ba9d5a7,0.07626962661743164,0.07617306709289551,0.07812213897705078,0.029280424118041992,0.07413959503173828,0.0799412727355957,0.07761764526367188,0.3223702907562256,0.24941277503967285,1.999312400817871,0.7541985511779785,0.0530240535736084,0.12252664566040039,0.055333852767944336,0.1211698055267334,0.12233090400695801,0.12127184867858887,0.12238454818725586,0.12475156784057617,0.12427091598510742,0.12454605102539062,0.12458395957946777,0.12551569938659668,0.2086467742919922,0.20574688911437988,2.346083879470825,0.8241596221923828,0.12411975860595703,0.12053132057189941,0.12397193908691406,0.1209874153137207,0.12272214889526367 diff --git a/results/combined/merges_timed/rcarz/jira-client.csv b/results/combined/merges_timed/rcarz/jira-client.csv index 4b251e3001..56beb8b28d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -101,refs/remotes/origin/pull/295,bcfc36277af06a98a808a3f83bc019232db1bd49,af3260c77d2cc0fe2c8b0d8089e7b7fd68abed91,ec5cc1cd8fcab98c87e02837e9e774b1eff4328a,,True,True,True,5,81,663,3,True,5,Tests_passed,a24c7f37958333a4571427a01f4dbe19b25233c70fe7e6e11a4b05e9156b4ba1,True,Tests_passed,7cdf69ff6ad2e7881862c68a71160d1af043bc1d368780aedba30deed0e0ca88,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,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,b34b7464714f9e9c48c3fef489bd2f3ea3345bc6bcdb4052f89f620419021f54,Merge_failed,b7d68736f54805cd88ab0235d1f409ceb6ccab477254624a8bb837db81e2fd14,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,e99bd815c4f828235885264e6d418743518600df4ba6572cb4b95ea0e71acc23,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,0.033385515213012695,0.05448746681213379,0.04417729377746582,0.021335124969482422,0.035360097885131836,0.038709402084350586,0.04232335090637207,0.23445487022399902,0.17163491249084473,0.9487850666046143,0.4935109615325928,0.04370713233947754,0.07275605201721191,0.05768227577209473,0.08488774299621582,0.08993244171142578 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +101,refs/remotes/origin/pull/295,bcfc36277af06a98a808a3f83bc019232db1bd49,af3260c77d2cc0fe2c8b0d8089e7b7fd68abed91,ec5cc1cd8fcab98c87e02837e9e774b1eff4328a,,True,True,True,5,81,663,3,True,5,Tests_passed,a24c7f37958333a4571427a01f4dbe19b25233c70fe7e6e11a4b05e9156b4ba1,True,Tests_passed,7cdf69ff6ad2e7881862c68a71160d1af043bc1d368780aedba30deed0e0ca88,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,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,b34b7464714f9e9c48c3fef489bd2f3ea3345bc6bcdb4052f89f620419021f54,Merge_failed,b7d68736f54805cd88ab0235d1f409ceb6ccab477254624a8bb837db81e2fd14,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,e99bd815c4f828235885264e6d418743518600df4ba6572cb4b95ea0e71acc23,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,807de93d4150494788e0178d1a9a0b2c82df2cf788563e453077858e62775f99,Tests_passed,53953c216da52d6b46ba54178ef91fd4bfcc52cd95564be4598bf3c68de5bb46,0.033385515213012695,0.05448746681213379,0.04417729377746582,0.021335124969482422,0.035360097885131836,0.038709402084350586,0.04232335090637207,0.23445487022399902,0.17163491249084473,0.9487850666046143,0.4935109615325928,0.04370713233947754,0.07275605201721191,0.05768227577209473,0.08488774299621582,0.08993244171142578,0.08064913749694824,0.08312082290649414,0.08599543571472168,0.08326172828674316,0.08333015441894531,0.08459210395812988,0.08372688293457031,0.12704014778137207,0.1414940357208252,0.9816126823425293,0.5636844635009766,0.08504581451416016,0.08500170707702637,0.08301377296447754,0.0829465389251709,0.08054471015930176 diff --git a/results/combined/merges_timed/rcongiu/hive-json-serde.csv b/results/combined/merges_timed/rcongiu/hive-json-serde.csv index a499aa9bc1..f0292d117d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,True,25,155,1097,2,True,25,Tests_passed,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,True,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,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,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,34df54d830736b580e3e8ac1fa28cd502ce2c0d8ac49bfe01b2132c6e3505c29,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,0.012160062789916992,0.012373208999633789,0.013889074325561523,0.022564172744750977,0.013921499252319336,0.013530969619750977,0.013926982879638672,0.03930401802062988,0.0669562816619873,0.8882541656494141,0.592106819152832,0.04004216194152832,0.06669878959655762,0.04089021682739258,0.06876683235168457,0.06783032417297363 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,True,25,155,1097,2,True,25,Tests_passed,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,True,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,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,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,34df54d830736b580e3e8ac1fa28cd502ce2c0d8ac49bfe01b2132c6e3505c29,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,Tests_passed,acd942ce0e6309ee51ec80d43de45db26b94a436963e890305b2a05d523bfac6,0.012160062789916992,0.012373208999633789,0.013889074325561523,0.022564172744750977,0.013921499252319336,0.013530969619750977,0.013926982879638672,0.03930401802062988,0.0669562816619873,0.8882541656494141,0.592106819152832,0.04004216194152832,0.06669878959655762,0.04089021682739258,0.06876683235168457,0.06783032417297363,0.06544804573059082,0.06567811965942383,0.06532835960388184,0.06428742408752441,0.06581425666809082,0.06872081756591797,0.06647920608520508,0.10055756568908691,0.09947586059570312,0.9671649932861328,0.6440961360931396,0.06205940246582031,0.0670161247253418,0.06599569320678711,0.06459379196166992,0.06645441055297852 diff --git a/results/combined/merges_timed/rcsb/colorbrewer.csv b/results/combined/merges_timed/rcsb/colorbrewer.csv index bf50b5acd5..1eb515a2e3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,True,12,68,454,2,True,12,Tests_passed,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,True,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,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,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffe578c21f31a1eb1a132ca4628dadf9ed6d1425a46a011c462de256078db404,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,66493ec62e2d5aa73c63d12b92f5e4341c421466bc8379c65ca0aa174cf37b76,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,0.04866838455200195,0.042530059814453125,0.01657700538635254,0.02340555191040039,0.045257568359375,0.04692864418029785,0.04195713996887207,0.16344785690307617,0.11564207077026367,1.1143171787261963,0.47612953186035156,0.053153038024902344,0.053330421447753906,0.05063009262084961,0.052625417709350586,0.05129408836364746 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,True,12,68,454,2,True,12,Tests_passed,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,True,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,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,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffe578c21f31a1eb1a132ca4628dadf9ed6d1425a46a011c462de256078db404,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,66493ec62e2d5aa73c63d12b92f5e4341c421466bc8379c65ca0aa174cf37b76,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,0.04866838455200195,0.042530059814453125,0.01657700538635254,0.02340555191040039,0.045257568359375,0.04692864418029785,0.04195713996887207,0.16344785690307617,0.11564207077026367,1.1143171787261963,0.47612953186035156,0.053153038024902344,0.053330421447753906,0.05063009262084961,0.052625417709350586,0.05129408836364746,0.051515817642211914,0.04972195625305176,0.05218935012817383,0.05307197570800781,0.05549192428588867,0.054559946060180664,0.05419135093688965,0.08856821060180664,0.10960125923156738,1.3626112937927246,0.5870509147644043,0.051605224609375,0.051021575927734375,0.05194544792175293,0.04889392852783203,0.05273318290710449 diff --git a/results/combined/merges_timed/rdfhdt/hdt-java.csv b/results/combined/merges_timed/rdfhdt/hdt-java.csv index c9a74e2c66..91750562fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -84,refs/heads/master,957ba7f643048114a3936adfae1d1f3b46a5cc12,f36f561a6571e7663568ed2f9f249ee01aac6502,8e23b101e278eda1b1ebcec4bca3543520717812,,True,True,True,110,289,1562.0,13,True,110,Tests_passed,beebd6d83095eb3f63fd612de75b2f86811d44481141ee5fe8071f5b170f72d0,True,Tests_passed,61a73b86a2d81844bb6289942366122c51c2c385d1968534f3b32c30e1fc9562,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,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,409786b41f86dc6b998e5b4b5639e59f29d167240283249a9c4fdcf50b4695f8,Tests_failed,498f22b151738f05a44be20b09a1331754394a2ce686bf6c7b175f790198c95d,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,0.021065950393676758,0.02107071876525879,0.024847030639648438,0.026967287063598633,0.025048017501831055,0.024925947189331055,0.024729490280151367,0.19023895263671875,0.6547856330871582,8.358103275299072,1.0670557022094727,0.05120849609375,0.3008458614349365,0.047501564025878906,0.29613518714904785,0.297060489654541 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +84,refs/heads/master,957ba7f643048114a3936adfae1d1f3b46a5cc12,f36f561a6571e7663568ed2f9f249ee01aac6502,8e23b101e278eda1b1ebcec4bca3543520717812,,True,True,True,110,289,1562.0,13,True,110,Tests_passed,beebd6d83095eb3f63fd612de75b2f86811d44481141ee5fe8071f5b170f72d0,True,Tests_passed,61a73b86a2d81844bb6289942366122c51c2c385d1968534f3b32c30e1fc9562,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,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,409786b41f86dc6b998e5b4b5639e59f29d167240283249a9c4fdcf50b4695f8,Tests_failed,498f22b151738f05a44be20b09a1331754394a2ce686bf6c7b175f790198c95d,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,Tests_passed,8e563544e48c58a715436cdb3ae419d8d5a962c5090a43254e96a0daed6fa3b8,0.021065950393676758,0.02107071876525879,0.024847030639648438,0.026967287063598633,0.025048017501831055,0.024925947189331055,0.024729490280151367,0.19023895263671875,0.6547856330871582,8.358103275299072,1.0670557022094727,0.05120849609375,0.3008458614349365,0.047501564025878906,0.29613518714904785,0.297060489654541,0.29827404022216797,0.29552197456359863,0.29630279541015625,0.3056297302246094,0.3083622455596924,0.3041050434112549,0.2991821765899658,0.5404908657073975,0.595545768737793,10.114020586013794,1.190117597579956,0.29529523849487305,0.2930753231048584,0.2918055057525635,0.2947862148284912,0.2951817512512207 diff --git a/results/combined/merges_timed/reckart/shib-http-client.csv b/results/combined/merges_timed/reckart/shib-http-client.csv index 78dee35227..ecb5a324ee 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,True,True,Tests_passed,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,True,2,19,97,2,True,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,True,2,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,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,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,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,04e53d839639ca4c0030acfe31877131e740f70989a95e35db07970dd71fe58d,Tests_failed,26e82e688b5e673886ccab23c2486f0682cf811d1ebe57127ab17443c5a56c29,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,0.042814016342163086,0.044199228286743164,0.042525529861450195,0.013966083526611328,0.04509735107421875,0.044655561447143555,0.04479408264160156,0.1647961139678955,0.11196041107177734,1.0000224113464355,0.32399702072143555,0.02844548225402832,0.05472588539123535,0.029401540756225586,0.05469822883605957,0.0536341667175293 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,True,True,Tests_passed,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,True,2,19,97,2,True,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,True,2,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,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,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,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,04e53d839639ca4c0030acfe31877131e740f70989a95e35db07970dd71fe58d,Tests_failed,26e82e688b5e673886ccab23c2486f0682cf811d1ebe57127ab17443c5a56c29,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,0.042814016342163086,0.044199228286743164,0.042525529861450195,0.013966083526611328,0.04509735107421875,0.044655561447143555,0.04479408264160156,0.1647961139678955,0.11196041107177734,1.0000224113464355,0.32399702072143555,0.02844548225402832,0.05472588539123535,0.029401540756225586,0.05469822883605957,0.0536341667175293,0.05289649963378906,0.053626060485839844,0.052924156188964844,0.05253887176513672,0.05225014686584473,0.05409669876098633,0.05238652229309082,0.08443641662597656,0.08495402336120605,1.0154850482940674,0.358734130859375,0.053882598876953125,0.05517697334289551,0.05377054214477539,0.05371594429016113,0.054143428802490234 diff --git a/results/combined/merges_timed/recommenders/rival.csv b/results/combined/merges_timed/recommenders/rival.csv index 01a31ad868..e359529b60 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,True,9,17,327,2,True,9,Tests_passed,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,True,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,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,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,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,efafe808ddaa3842942078a58d5b3b1a874cb624fb2c25ce42ce5ae1c6b33df1,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,0.04232907295227051,0.04488635063171387,0.048690080642700195,0.027636051177978516,0.04055380821228027,0.04505491256713867,0.03595423698425293,0.16249752044677734,0.08306241035461426,0.8822517395019531,0.36553120613098145,0.03370833396911621,0.07265973091125488,0.04904532432556152,0.0692753791809082,0.07367944717407227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,True,9,17,327,2,True,9,Tests_passed,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,True,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,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,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,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,efafe808ddaa3842942078a58d5b3b1a874cb624fb2c25ce42ce5ae1c6b33df1,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,0.04232907295227051,0.04488635063171387,0.048690080642700195,0.027636051177978516,0.04055380821228027,0.04505491256713867,0.03595423698425293,0.16249752044677734,0.08306241035461426,0.8822517395019531,0.36553120613098145,0.03370833396911621,0.07265973091125488,0.04904532432556152,0.0692753791809082,0.07367944717407227,0.05718350410461426,0.07590293884277344,0.07838273048400879,0.06017112731933594,0.0751655101776123,0.07565498352050781,0.07319450378417969,0.11548089981079102,0.10723376274108887,1.0347065925598145,0.43746495246887207,0.073394775390625,0.06950116157531738,0.07285404205322266,0.05950665473937988,0.07348227500915527 diff --git a/results/combined/merges_timed/recruit-tech/redpen.csv b/results/combined/merges_timed/recruit-tech/redpen.csv index 485950972a..e53a5ac15c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,False,True,14,52,178,2,True,14,Tests_passed,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,True,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,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,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,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,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,91021b0007cc8afefc2dd22c86e6b88fe5e8aa0a3c566830082a748ddc705c54,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,0.047443389892578125,0.045870065689086914,0.0496065616607666,0.01838231086730957,0.02188563346862793,0.04604983329772949,0.03578996658325195,0.15380287170410156,0.11947250366210938,0.6913967132568359,0.34085941314697266,0.036975860595703125,0.06165504455566406,0.03641629219055176,0.06134510040283203,0.061705827713012695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,False,True,14,52,178,2,True,14,Tests_passed,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,True,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,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,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,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,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,91021b0007cc8afefc2dd22c86e6b88fe5e8aa0a3c566830082a748ddc705c54,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,0.047443389892578125,0.045870065689086914,0.0496065616607666,0.01838231086730957,0.02188563346862793,0.04604983329772949,0.03578996658325195,0.15380287170410156,0.11947250366210938,0.6913967132568359,0.34085941314697266,0.036975860595703125,0.06165504455566406,0.03641629219055176,0.06134510040283203,0.061705827713012695,0.06075239181518555,0.05886697769165039,0.06466269493103027,0.06326937675476074,0.060530900955200195,0.06236457824707031,0.061731576919555664,0.09754037857055664,0.09784293174743652,0.8339977264404297,0.43003273010253906,0.060144662857055664,0.062215328216552734,0.06038355827331543,0.06518054008483887,0.060289859771728516 diff --git a/results/combined/merges_timed/redhogs/cron-parser.csv b/results/combined/merges_timed/redhogs/cron-parser.csv index d8b116c2a6..475a5751f6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,True,True,Tests_passed,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,True,7,17,1176,3,True,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,True,7,True,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,81bfe11d6d63829c81eb6af8462a91378fffdb1d4367cd2b7fe6935982fe444f,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,0.03078174591064453,0.039942026138305664,0.04521012306213379,0.016041040420532227,0.04386734962463379,0.044976234436035156,0.050771474838256836,0.23487067222595215,0.17686915397644043,0.6570889949798584,0.2607254981994629,0.039334774017333984,0.04089760780334473,0.0389246940612793,0.041475772857666016,0.04187750816345215 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,True,True,Tests_passed,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,True,7,17,1176,3,True,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,True,7,True,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,81bfe11d6d63829c81eb6af8462a91378fffdb1d4367cd2b7fe6935982fe444f,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,0.03078174591064453,0.039942026138305664,0.04521012306213379,0.016041040420532227,0.04386734962463379,0.044976234436035156,0.050771474838256836,0.23487067222595215,0.17686915397644043,0.6570889949798584,0.2607254981994629,0.039334774017333984,0.04089760780334473,0.0389246940612793,0.041475772857666016,0.04187750816345215,0.03902411460876465,0.03933835029602051,0.038860321044921875,0.03932023048400879,0.03911232948303223,0.03999662399291992,0.04002118110656738,0.08741354942321777,0.097747802734375,0.69040846824646,0.3015763759613037,0.03914380073547363,0.03834867477416992,0.03945040702819824,0.03919219970703125,0.038974761962890625 diff --git a/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv b/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv index 748b74e593..cf8a83fbd3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,True,True,True,31,82,320,2,True,31,Tests_passed,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,True,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,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,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,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,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,a36cbc1ff3c6ee13ff09a82a416d952f6be15b2203243c58094c9756276c3b20,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,0.05435585975646973,0.0455629825592041,0.05287337303161621,0.019965171813964844,0.05508232116699219,0.04820847511291504,0.04382467269897461,0.17595577239990234,0.10870981216430664,1.389901876449585,0.8441858291625977,0.03740835189819336,0.07455778121948242,0.04525160789489746,0.07267999649047852,0.06832098960876465 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,True,True,True,31,82,320,2,True,31,Tests_passed,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,True,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,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,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,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,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,a36cbc1ff3c6ee13ff09a82a416d952f6be15b2203243c58094c9756276c3b20,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,0.05435585975646973,0.0455629825592041,0.05287337303161621,0.019965171813964844,0.05508232116699219,0.04820847511291504,0.04382467269897461,0.17595577239990234,0.10870981216430664,1.389901876449585,0.8441858291625977,0.03740835189819336,0.07455778121948242,0.04525160789489746,0.07267999649047852,0.06832098960876465,0.062308549880981445,0.07010722160339355,0.07123517990112305,0.06550288200378418,0.0756387710571289,0.0753633975982666,0.064208984375,0.10479283332824707,0.09197354316711426,1.3039932250976562,0.8340303897857666,0.06996774673461914,0.07250761985778809,0.061289310455322266,0.06845211982727051,0.07060647010803223 diff --git a/results/combined/merges_timed/redsolution/otr4j.csv b/results/combined/merges_timed/redsolution/otr4j.csv index 4c81443328..86d27296ac 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,True,True,Tests_passed,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,True,15,86,2135,2,True,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,True,15,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,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,aeb2e9f0aed066ff18b8bfab95b4f0ddbf8f84847b834d67b8221e312930b8d6,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,4330f53df7863d4752eb28f9de9ec4c0e4672fffe3a6cd17a4b8a549eee6a448,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,0.012730836868286133,0.01240992546081543,0.013198137283325195,0.021405458450317383,0.013331174850463867,0.013328075408935547,0.013620376586914062,0.040426015853881836,0.07405614852905273,0.9386904239654541,0.6256122589111328,0.05046963691711426,0.04902148246765137,0.05409073829650879,0.052898406982421875,0.05796170234680176 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,True,True,Tests_passed,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,True,15,86,2135,2,True,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,True,15,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,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,aeb2e9f0aed066ff18b8bfab95b4f0ddbf8f84847b834d67b8221e312930b8d6,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,4330f53df7863d4752eb28f9de9ec4c0e4672fffe3a6cd17a4b8a549eee6a448,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,0.012730836868286133,0.01240992546081543,0.013198137283325195,0.021405458450317383,0.013331174850463867,0.013328075408935547,0.013620376586914062,0.040426015853881836,0.07405614852905273,0.9386904239654541,0.6256122589111328,0.05046963691711426,0.04902148246765137,0.05409073829650879,0.052898406982421875,0.05796170234680176,0.05324053764343262,0.05449843406677246,0.05306720733642578,0.058155059814453125,0.061499834060668945,0.0595545768737793,0.05974245071411133,0.09278464317321777,0.09659051895141602,1.0210964679718018,0.6726193428039551,0.05310487747192383,0.05515241622924805,0.05266928672790527,0.05421781539916992,0.05245327949523926 diff --git a/results/combined/merges_timed/reficio/p2-maven-plugin.csv b/results/combined/merges_timed/reficio/p2-maven-plugin.csv index 83e7ad3b01..0a786fde9c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,True,6,9,188,5,True,9,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,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,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,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,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,193fdeba0a08972492649e5f2c696d016f73984182bb044708bc81456997953b,Tests_failed,0435bc82f9a0b2816071b90a16e7566ab7781f1ef61d66bd97e24c9db9389eef,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,0.04572319984436035,0.04218006134033203,0.042825937271118164,0.021386384963989258,0.030017375946044922,0.04366922378540039,0.03965878486633301,0.15820002555847168,0.1149599552154541,0.9635367393493652,0.340071439743042,0.04323387145996094,0.06897234916687012,0.0417025089263916,0.058643341064453125,0.06931352615356445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,True,6,9,188,5,True,9,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,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,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,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,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,193fdeba0a08972492649e5f2c696d016f73984182bb044708bc81456997953b,Tests_failed,0435bc82f9a0b2816071b90a16e7566ab7781f1ef61d66bd97e24c9db9389eef,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,0.04572319984436035,0.04218006134033203,0.042825937271118164,0.021386384963989258,0.030017375946044922,0.04366922378540039,0.03965878486633301,0.15820002555847168,0.1149599552154541,0.9635367393493652,0.340071439743042,0.04323387145996094,0.06897234916687012,0.0417025089263916,0.058643341064453125,0.06931352615356445,0.06843090057373047,0.05420732498168945,0.06767868995666504,0.06882977485656738,0.07262659072875977,0.0664520263671875,0.05623340606689453,0.10321164131164551,0.10006070137023926,1.0521862506866455,0.37268781661987305,0.0645456314086914,0.06449413299560547,0.06501007080078125,0.05746269226074219,0.06673312187194824 diff --git a/results/combined/merges_timed/reinert/jjschema.csv b/results/combined/merges_timed/reinert/jjschema.csv index 90f65e770d..c32465d9fc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,True,8,28,74,4,True,8,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,True,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,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,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_failed,c3434af7a4364a5ac1fa45c3c356fb14f388d9ecc8f5e479a695e8955c41bba5,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,0.014084339141845703,0.013935089111328125,0.015578031539916992,0.020114660263061523,0.015547513961791992,0.01589369773864746,0.01563286781311035,0.07394051551818848,0.18160796165466309,0.029676437377929688,0.4066734313964844,0.043313026428222656,0.10880756378173828,0.04241585731506348,0.10843181610107422,0.10956144332885742 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,True,8,28,74,4,True,8,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,True,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,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,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_failed,c3434af7a4364a5ac1fa45c3c356fb14f388d9ecc8f5e479a695e8955c41bba5,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,0.014084339141845703,0.013935089111328125,0.015578031539916992,0.020114660263061523,0.015547513961791992,0.01589369773864746,0.01563286781311035,0.07394051551818848,0.18160796165466309,0.029676437377929688,0.4066734313964844,0.043313026428222656,0.10880756378173828,0.04241585731506348,0.10843181610107422,0.10956144332885742,0.10510993003845215,0.10455703735351562,0.10464930534362793,0.10316348075866699,0.10780215263366699,0.10190844535827637,0.1051187515258789,0.17267465591430664,0.17867016792297363,0.11993408203125,0.4360620975494385,0.10366582870483398,0.10163664817810059,0.1025397777557373,0.10374641418457031,0.0982367992401123 diff --git a/results/combined/merges_timed/relayrides/pushy.csv b/results/combined/merges_timed/relayrides/pushy.csv index 8c62d3ad11..d5fb19cae9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -194,refs/heads/main,37aade73e77e75f5aab20300651a247d9b96c1ab,ff61066de3f0d95df8ea8d52e00964b0fa23b294,9886db776864ebac91327b127008ab9013ab38b6,,True,True,True,26,267,2922,4,True,26,Tests_passed,b9bcf51788f6efdb084c19c317e9d9c7db6eecdc2bcf2e085b561542162a28f8,True,Tests_passed,d167b8cd68816774c58ef578198562d232a54861914c1857b6e79781c7276ce2,True,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,031e7031e0768074b361f5d4872018d5283688b4e4a63d7c04dcf168d9b03925,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,9e950886f6bdf20f5485b2072f3d7759e7ff6571fb26d3be1744b7d15522bc37,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,581f85b2c061c50aaf23ed8d90956e2817da52c3f84417b065c84ef2ca69ee5f,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,598f20b1a2f96f4dfb54ce0fb4007a40eb57f499d5b3adc2c2bf8ebad40e53c4,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,0.013028860092163086,0.04218697547912598,0.046770334243774414,0.018303394317626953,0.05138540267944336,0.04596114158630371,0.012801408767700195,0.28589606285095215,0.1712172031402588,1.7000908851623535,1.144361972808838,0.04796195030212402,0.06881904602050781,0.04763293266296387,0.07967138290405273,0.07957983016967773 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +194,refs/heads/main,37aade73e77e75f5aab20300651a247d9b96c1ab,ff61066de3f0d95df8ea8d52e00964b0fa23b294,9886db776864ebac91327b127008ab9013ab38b6,,True,True,True,26,267,2922,4,True,26,Tests_passed,b9bcf51788f6efdb084c19c317e9d9c7db6eecdc2bcf2e085b561542162a28f8,True,Tests_passed,d167b8cd68816774c58ef578198562d232a54861914c1857b6e79781c7276ce2,True,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,031e7031e0768074b361f5d4872018d5283688b4e4a63d7c04dcf168d9b03925,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,9e950886f6bdf20f5485b2072f3d7759e7ff6571fb26d3be1744b7d15522bc37,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,581f85b2c061c50aaf23ed8d90956e2817da52c3f84417b065c84ef2ca69ee5f,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,598f20b1a2f96f4dfb54ce0fb4007a40eb57f499d5b3adc2c2bf8ebad40e53c4,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,Merge_failed,89385f052d6d9791768cbab138b41deaaa6141a32f44b467bf9ee8ef9660a812,0.013028860092163086,0.04218697547912598,0.046770334243774414,0.018303394317626953,0.05138540267944336,0.04596114158630371,0.012801408767700195,0.28589606285095215,0.1712172031402588,1.7000908851623535,1.144361972808838,0.04796195030212402,0.06881904602050781,0.04763293266296387,0.07967138290405273,0.07957983016967773,0.07650899887084961,0.0751340389251709,0.0779576301574707,0.07825446128845215,0.07718873023986816,0.07757759094238281,0.07760238647460938,0.1342482566833496,0.1345224380493164,1.7433440685272217,1.165830373764038,0.07554221153259277,0.0775299072265625,0.07815003395080566,0.0753476619720459,0.07895827293395996 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 41b208994f..42ffcc2b4d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,True,5,16,76,3,True,5,Tests_passed,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,True,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,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,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,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,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,a2614c349fb52ab4a7b07096eda820fcf22c8ca2acfbed492fecf6177c357148,Tests_failed,5196f4cafa6fdad893af4bae5cdf8b95599cdb89544a96794e866fb179571fa7,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,0.04129624366760254,0.043050527572631836,0.04796433448791504,0.018744468688964844,0.05438876152038574,0.048902034759521484,0.02735733985900879,0.23865175247192383,0.16268062591552734,2.4165632724761963,0.4075596332550049,0.04087471961975098,0.08607935905456543,0.05778980255126953,0.0894474983215332,0.08878850936889648 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,True,5,16,76,3,True,5,Tests_passed,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,True,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,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,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,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,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,a2614c349fb52ab4a7b07096eda820fcf22c8ca2acfbed492fecf6177c357148,Tests_failed,5196f4cafa6fdad893af4bae5cdf8b95599cdb89544a96794e866fb179571fa7,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,0.04129624366760254,0.043050527572631836,0.04796433448791504,0.018744468688964844,0.05438876152038574,0.048902034759521484,0.02735733985900879,0.23865175247192383,0.16268062591552734,2.4165632724761963,0.4075596332550049,0.04087471961975098,0.08607935905456543,0.05778980255126953,0.0894474983215332,0.08878850936889648,0.08546638488769531,0.10637140274047852,0.10882377624511719,0.08863568305969238,0.08818960189819336,0.11081480979919434,0.11122941970825195,0.14168596267700195,0.15099096298217773,2.5579586029052734,0.45867323875427246,0.10109210014343262,0.09052157402038574,0.08817625045776367,0.11180353164672852,0.10737180709838867 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 f3e65a1453..51f2c04c56 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,True,10,69,1910,2,True,10,Tests_passed,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,True,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,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,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,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,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,a552f697a8bdd0be44be32f13e0a3d87a8dce0abe572629eb18d929d0f613b18,Tests_failed,06cebf32d6bde94b118216ae2ba430753596bf658cb40beaef48fb11ad6cb5f3,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,0.04607224464416504,0.04683518409729004,0.01387786865234375,0.09453201293945312,0.04167366027832031,0.0839393138885498,0.01137852668762207,0.18076634407043457,0.10594820976257324,0.6746811866760254,3.1434755325317383,0.1473844051361084,0.16549324989318848,0.0327305793762207,0.16086101531982422,0.16146326065063477 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,True,10,69,1910,2,True,10,Tests_passed,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,True,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,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,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,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,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,a552f697a8bdd0be44be32f13e0a3d87a8dce0abe572629eb18d929d0f613b18,Tests_failed,06cebf32d6bde94b118216ae2ba430753596bf658cb40beaef48fb11ad6cb5f3,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,0.04607224464416504,0.04683518409729004,0.01387786865234375,0.09453201293945312,0.04167366027832031,0.0839393138885498,0.01137852668762207,0.18076634407043457,0.10594820976257324,0.6746811866760254,3.1434755325317383,0.1473844051361084,0.16549324989318848,0.0327305793762207,0.16086101531982422,0.16146326065063477,0.16376256942749023,0.17033028602600098,0.2009444236755371,0.18895888328552246,0.19178295135498047,0.18997693061828613,0.18620991706848145,0.24369120597839355,0.20387554168701172,0.8305442333221436,3.3381946086883545,0.05665421485900879,0.14715313911437988,0.15839481353759766,0.1674809455871582,0.15451908111572266 diff --git a/results/combined/merges_timed/renggli/java-petitparser.csv b/results/combined/merges_timed/renggli/java-petitparser.csv index 73862f40ae..e5cd98592d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,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,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,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,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,0a074498ba4e1af5ba6547bc42a0a3e22b0cc7e8cd6d55383a2126ea1c0b47bf,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,0.04942202568054199,0.05022859573364258,0.047605276107788086,0.019308805465698242,0.044625043869018555,0.042426109313964844,0.04822540283203125,0.23439264297485352,0.1763904094696045,1.2477366924285889,0.3027315139770508,0.036574602127075195,0.07977294921875,0.03804349899291992,0.07973837852478027,0.07952570915222168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,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,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,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,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,0a074498ba4e1af5ba6547bc42a0a3e22b0cc7e8cd6d55383a2126ea1c0b47bf,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,0.04942202568054199,0.05022859573364258,0.047605276107788086,0.019308805465698242,0.044625043869018555,0.042426109313964844,0.04822540283203125,0.23439264297485352,0.1763904094696045,1.2477366924285889,0.3027315139770508,0.036574602127075195,0.07977294921875,0.03804349899291992,0.07973837852478027,0.07952570915222168,0.07941341400146484,0.08004045486450195,0.08210396766662598,0.0808722972869873,0.08344602584838867,0.08325791358947754,0.08057403564453125,0.13455843925476074,0.137864351272583,1.4032282829284668,0.34802699089050293,0.07823872566223145,0.08071684837341309,0.07963085174560547,0.07891011238098145,0.07927584648132324 diff --git a/results/combined/merges_timed/renggli/petitparserjava.csv b/results/combined/merges_timed/renggli/petitparserjava.csv index c543b2c946..5e5e84f3ff 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,True,18,89,800,5,True,19,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,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,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,258079c9db50a9586a209cdbb4cc4fb879dd7261c53ec72c90dfc3faaebaaa29,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,9b8ce13ab0af319e086a4018297d687cd67eee6c090a8826d160e719251fd93a,Tests_passed,9e8cef472ffa900f053502d985d9a13f2808677fdb47b5328e020966d0ce8e07,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.04497075080871582,0.043775320053100586,0.03349924087524414,0.01827526092529297,0.05392313003540039,0.045473337173461914,0.05715751647949219,0.2990546226501465,0.21396470069885254,1.3772261142730713,1.0974421501159668,0.04407382011413574,0.08269309997558594,0.04544639587402344,0.08504557609558105,0.08279013633728027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,True,18,89,800,5,True,19,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,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,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,258079c9db50a9586a209cdbb4cc4fb879dd7261c53ec72c90dfc3faaebaaa29,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,9b8ce13ab0af319e086a4018297d687cd67eee6c090a8826d160e719251fd93a,Tests_passed,9e8cef472ffa900f053502d985d9a13f2808677fdb47b5328e020966d0ce8e07,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.04497075080871582,0.043775320053100586,0.03349924087524414,0.01827526092529297,0.05392313003540039,0.045473337173461914,0.05715751647949219,0.2990546226501465,0.21396470069885254,1.3772261142730713,1.0974421501159668,0.04407382011413574,0.08269309997558594,0.04544639587402344,0.08504557609558105,0.08279013633728027,0.07955121994018555,0.07801008224487305,0.08183026313781738,0.08176064491271973,0.07953357696533203,0.08077335357666016,0.0787205696105957,0.1473381519317627,0.16141128540039062,1.4564778804779053,1.220658540725708,0.08056449890136719,0.08107519149780273,0.08172893524169922,0.08170247077941895,0.08081364631652832 diff --git a/results/combined/merges_timed/resthub/springmvc-router.csv b/results/combined/merges_timed/resthub/springmvc-router.csv index 345b9f54e1..4975ad3ca0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,True,20,111,2216,4,True,20,Tests_passed,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,True,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,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,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Tests_failed,cb62aeaa9cca9562e53c67fd31855c8d90c0486159989292ad0f4fa15039ee0a,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,ffd20aea132eb11db0930bb6c1e5b980ba1f00ab599ac51de252d997da537f1b,Merge_failed,24e266324b3461271c753990c65aceae536a587426b667971aa269ba012f85c8,Tests_passed,dc44875c94aa27e66245fc75c93dcc199503da5f4c1e04ff74ef63ca2648fc57,Tests_passed,59e06058b8ffe7cef8d7ffc4927bcf156cfeeadaed15632ebf8b23434bb6983f,Tests_failed,5b32a81db6a4eb49099cdb54663934c67eacfa8722cf23258d55e9d2abf25196,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,0.03872871398925781,0.04697155952453613,0.04500102996826172,0.015391111373901367,0.036568641662597656,0.0408017635345459,0.04121255874633789,0.28460073471069336,0.24010634422302246,1.4766814708709717,0.5456421375274658,0.04093575477600098,0.08144831657409668,0.04126310348510742,0.0828397274017334,0.08171463012695312 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,True,20,111,2216,4,True,20,Tests_passed,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,True,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,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,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Tests_failed,cb62aeaa9cca9562e53c67fd31855c8d90c0486159989292ad0f4fa15039ee0a,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,ffd20aea132eb11db0930bb6c1e5b980ba1f00ab599ac51de252d997da537f1b,Merge_failed,24e266324b3461271c753990c65aceae536a587426b667971aa269ba012f85c8,Tests_passed,dc44875c94aa27e66245fc75c93dcc199503da5f4c1e04ff74ef63ca2648fc57,Tests_passed,59e06058b8ffe7cef8d7ffc4927bcf156cfeeadaed15632ebf8b23434bb6983f,Tests_failed,5b32a81db6a4eb49099cdb54663934c67eacfa8722cf23258d55e9d2abf25196,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,dfb5da2a9fafd1c63d18f61a6754184c38dd29e22088da3b3f791788cef5e2ac,Merge_failed,13da04cdd00cb6752ebe46e4bd3b3bd9b9f2b15e1607e7223d3c55089a12b8f3,0.03872871398925781,0.04697155952453613,0.04500102996826172,0.015391111373901367,0.036568641662597656,0.0408017635345459,0.04121255874633789,0.28460073471069336,0.24010634422302246,1.4766814708709717,0.5456421375274658,0.04093575477600098,0.08144831657409668,0.04126310348510742,0.0828397274017334,0.08171463012695312,0.0792689323425293,0.07924151420593262,0.07727193832397461,0.07948994636535645,0.07926106452941895,0.07728219032287598,0.07740378379821777,0.1397559642791748,0.18067121505737305,1.5122594833374023,0.644031286239624,0.07595992088317871,0.07816338539123535,0.07808971405029297,0.07910919189453125,0.07860684394836426 diff --git a/results/combined/merges_timed/resty-gwt/resty-gwt.csv b/results/combined/merges_timed/resty-gwt/resty-gwt.csv index 8261a902b0..8c368b0494 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,True,76,362,3588.0,3,True,80,Tests_passed,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,True,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,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_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,20e32fae5bc69b66e8a2ed31ec70fbfaa97225a503892dd550a0b7b2395ab32c,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,0.017783641815185547,0.021543025970458984,0.027135848999023438,0.026362895965576172,0.02328801155090332,0.027645111083984375,0.026882171630859375,0.07192277908325195,0.12758803367614746,1.0986828804016113,1.3246972560882568,0.04535317420959473,0.09329962730407715,0.05978083610534668,0.11330652236938477,0.09561800956726074 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,True,76,362,3588.0,3,True,80,Tests_passed,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,True,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,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_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,20e32fae5bc69b66e8a2ed31ec70fbfaa97225a503892dd550a0b7b2395ab32c,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,Tests_passed,c8d280ccc0792523b130f65dbf8a460268b7cae86ab1c7c1deae264a24c26375,0.017783641815185547,0.021543025970458984,0.027135848999023438,0.026362895965576172,0.02328801155090332,0.027645111083984375,0.026882171630859375,0.07192277908325195,0.12758803367614746,1.0986828804016113,1.3246972560882568,0.04535317420959473,0.09329962730407715,0.05978083610534668,0.11330652236938477,0.09561800956726074,0.10111188888549805,0.09734702110290527,0.09700775146484375,0.12355589866638184,0.09859180450439453,0.09586119651794434,0.10095667839050293,0.1533515453338623,0.15465903282165527,1.2878596782684326,1.5215506553649902,0.0939948558807373,0.09465527534484863,0.11060523986816406,0.09555697441101074,0.09603190422058105 diff --git a/results/combined/merges_timed/richardwarburton/lambda-behave.csv b/results/combined/merges_timed/richardwarburton/lambda-behave.csv index 856627163f..ef3e9eb766 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,Tests_passed,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,True,23,45,246,3,True,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,True,23,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,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Tests_failed,2ce40dfd880d5c928eadede3c6f8fd3345890896a064ad25abd7f9ba6ea56f00,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,439c1bb86c08f564470e184bf5ac175aa68ed2db713823436134dd99dcf3ef8b,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,4ee011bdb0ccee8e0421ad34cefe55d751d6d052c8aab117f31528bf086a0581,Tests_failed,8b910eabb86301a45b785e7ff37578a4d538eda5cc4df660dd2a2467659be4f9,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,0.010235071182250977,0.009866714477539062,0.010353565216064453,0.015196561813354492,0.01004791259765625,0.010221719741821289,0.010025501251220703,0.05066347122192383,0.13028812408447266,0.609471321105957,0.3165595531463623,0.04082036018371582,0.06106448173522949,0.04157304763793945,0.06202507019042969,0.06163501739501953 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,Tests_passed,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,True,23,45,246,3,True,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,True,23,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,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Tests_failed,2ce40dfd880d5c928eadede3c6f8fd3345890896a064ad25abd7f9ba6ea56f00,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,439c1bb86c08f564470e184bf5ac175aa68ed2db713823436134dd99dcf3ef8b,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,4ee011bdb0ccee8e0421ad34cefe55d751d6d052c8aab117f31528bf086a0581,Tests_failed,8b910eabb86301a45b785e7ff37578a4d538eda5cc4df660dd2a2467659be4f9,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,0.010235071182250977,0.009866714477539062,0.010353565216064453,0.015196561813354492,0.01004791259765625,0.010221719741821289,0.010025501251220703,0.05066347122192383,0.13028812408447266,0.609471321105957,0.3165595531463623,0.04082036018371582,0.06106448173522949,0.04157304763793945,0.06202507019042969,0.06163501739501953,0.05903148651123047,0.05874896049499512,0.05907630920410156,0.059075355529785156,0.05996131896972656,0.05972409248352051,0.058339834213256836,0.10742998123168945,0.13010191917419434,0.6179671287536621,0.39241743087768555,0.05860447883605957,0.05922198295593262,0.05857276916503906,0.05995583534240723,0.05976390838623047 diff --git a/results/combined/merges_timed/risingoak/jenkins-client.csv b/results/combined/merges_timed/risingoak/jenkins-client.csv index 9a5fa6c6d3..58f5d31e8e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,True,14,44,551,2,True,14,Tests_passed,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,True,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,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,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,915afd1ca713f3be7698f8046458e4a352485cde6929db95b26ff2012cbcada7,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,0.04503774642944336,0.04433155059814453,0.04630231857299805,0.015373706817626953,0.044297218322753906,0.04596138000488281,0.03574872016906738,0.16649484634399414,0.11400437355041504,0.707813024520874,0.34736108779907227,0.03142857551574707,0.05634284019470215,0.030368566513061523,0.05647921562194824,0.05586600303649902 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,True,14,44,551,2,True,14,Tests_passed,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,True,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,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,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,915afd1ca713f3be7698f8046458e4a352485cde6929db95b26ff2012cbcada7,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,Tests_passed,a627564ebcfd4ccdfc42c1d03c59a49e11b5bc4b03f2b08412fd616d0781d0ff,0.04503774642944336,0.04433155059814453,0.04630231857299805,0.015373706817626953,0.044297218322753906,0.04596138000488281,0.03574872016906738,0.16649484634399414,0.11400437355041504,0.707813024520874,0.34736108779907227,0.03142857551574707,0.05634284019470215,0.030368566513061523,0.05647921562194824,0.05586600303649902,0.0551602840423584,0.05450773239135742,0.05533409118652344,0.05440473556518555,0.055013179779052734,0.055008888244628906,0.05425691604614258,0.08621382713317871,0.08268356323242188,0.7452194690704346,0.3753852844238281,0.05545639991760254,0.052865028381347656,0.05496954917907715,0.0537412166595459,0.05342888832092285 diff --git a/results/combined/merges_timed/rjohnsondev/java-libpst.csv b/results/combined/merges_timed/rjohnsondev/java-libpst.csv index 7cb46850fa..d20376969e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,Tests_passed,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,True,14,93,718.0,3,True,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,True,14,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,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,37d40e3478d19b74970fcfd9f3e1a0844ea46e9d056983d14516ac0b510d91b1,Tests_failed,814abca7f3c30e679cf72b28881879035cb81d9e8818fa1c24a47500e247ad15,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,0.0961461067199707,0.09292721748352051,0.14193201065063477,0.12858819961547852,0.1369779109954834,0.1422421932220459,0.14014863967895508,0.24657511711120605,0.21096253395080566,2.195932626724243,0.6452546119689941,0.20516753196716309,0.2845797538757324,0.19385123252868652,0.2770414352416992,0.2613837718963623 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,Tests_passed,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,True,14,93,718.0,3,True,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,True,14,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,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,37d40e3478d19b74970fcfd9f3e1a0844ea46e9d056983d14516ac0b510d91b1,Tests_failed,814abca7f3c30e679cf72b28881879035cb81d9e8818fa1c24a47500e247ad15,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,Tests_passed,dbe377e0217519533b168c4980d85784d38d868cbe1f93bcdc9d50189488c7be,0.0961461067199707,0.09292721748352051,0.14193201065063477,0.12858819961547852,0.1369779109954834,0.1422421932220459,0.14014863967895508,0.24657511711120605,0.21096253395080566,2.195932626724243,0.6452546119689941,0.20516753196716309,0.2845797538757324,0.19385123252868652,0.2770414352416992,0.2613837718963623,0.26691579818725586,0.23261570930480957,0.31669092178344727,0.21863174438476562,0.3252687454223633,0.22282695770263672,0.3126862049102783,0.4263725280761719,0.29952120780944824,2.237421989440918,0.8072452545166016,0.2663757801055908,0.2548544406890869,0.2807118892669678,0.2491462230682373,0.2749595642089844 diff --git a/results/combined/merges_timed/rncryptor/jncryptor.csv b/results/combined/merges_timed/rncryptor/jncryptor.csv index 75fe6e606c..c961de6dd8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,True,10,31,181,3,True,10,Tests_passed,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,True,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,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,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,87460aa5b1879a0b5707acd78b35abe68d608ee75757c853850ab1a8ea5fb4b5,Tests_failed,94406fd7202952c2d2909cac1c162ef77896b5c65d9027aacdc6c92eb7f07e0f,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,0.04300403594970703,0.03883242607116699,0.03608202934265137,0.017162084579467773,0.037552833557128906,0.04473710060119629,0.03963184356689453,0.23386120796203613,0.16720867156982422,1.5109608173370361,0.33107423782348633,0.03167986869812012,0.0801541805267334,0.03280353546142578,0.07946586608886719,0.07779383659362793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,True,10,31,181,3,True,10,Tests_passed,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,True,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,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,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,87460aa5b1879a0b5707acd78b35abe68d608ee75757c853850ab1a8ea5fb4b5,Tests_failed,94406fd7202952c2d2909cac1c162ef77896b5c65d9027aacdc6c92eb7f07e0f,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,Tests_passed,45abfb0c70e8dd89a4e01bf71e1e84099a941d9a7f0107683bb827dadad415c4,0.04300403594970703,0.03883242607116699,0.03608202934265137,0.017162084579467773,0.037552833557128906,0.04473710060119629,0.03963184356689453,0.23386120796203613,0.16720867156982422,1.5109608173370361,0.33107423782348633,0.03167986869812012,0.0801541805267334,0.03280353546142578,0.07946586608886719,0.07779383659362793,0.07971692085266113,0.07960200309753418,0.07959866523742676,0.07906699180603027,0.07932019233703613,0.08037066459655762,0.08008193969726562,0.13106012344360352,0.13568568229675293,1.7262775897979736,0.37633824348449707,0.0796501636505127,0.07735252380371094,0.07920265197753906,0.07883834838867188,0.07843494415283203 diff --git a/results/combined/merges_timed/rnewson/couchdb-lucene.csv b/results/combined/merges_timed/rnewson/couchdb-lucene.csv index 501f520371..f51bbe1f43 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -51,refs/heads/master,f9e7354b4dc38678549f66943f25d05962de3049,a3a70153628e5d1c6faa1418bef09e8e3090a29d,682e93f3ac6bb4b870e71c97864ae313a0edfafb,,True,True,True,10,16,621,2,True,10,Tests_passed,721f1627b793685addda9b9fd499f963abeed08af6cc76a19f3a8a0b8c8ffb09,True,Tests_passed,add5690542149e1c451d3335bddb2887de735c53b1053ae219cb92f66badd66d,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,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_failed,46309defa7a855bcef74d0539a2346cb30dfd61aade17475c4c7742ccd893e4e,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,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,1f7aa2cf6aeb2fc904626c8201b688cd1ca86cebca23c19d3b8add0352fe5672,Tests_failed,46309defa7a855bcef74d0539a2346cb30dfd61aade17475c4c7742ccd893e4e,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,0.008959531784057617,0.008867502212524414,0.009128093719482422,0.015305280685424805,0.009104728698730469,0.009095191955566406,0.009429931640625,0.03239703178405762,0.0635077953338623,0.9902217388153076,0.3331596851348877,0.029981374740600586,0.05519270896911621,0.03045034408569336,0.05691385269165039,0.0567164421081543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +51,refs/heads/master,f9e7354b4dc38678549f66943f25d05962de3049,a3a70153628e5d1c6faa1418bef09e8e3090a29d,682e93f3ac6bb4b870e71c97864ae313a0edfafb,,True,True,True,10,16,621,2,True,10,Tests_passed,721f1627b793685addda9b9fd499f963abeed08af6cc76a19f3a8a0b8c8ffb09,True,Tests_passed,add5690542149e1c451d3335bddb2887de735c53b1053ae219cb92f66badd66d,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,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_failed,46309defa7a855bcef74d0539a2346cb30dfd61aade17475c4c7742ccd893e4e,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,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,1f7aa2cf6aeb2fc904626c8201b688cd1ca86cebca23c19d3b8add0352fe5672,Tests_failed,46309defa7a855bcef74d0539a2346cb30dfd61aade17475c4c7742ccd893e4e,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,0.008959531784057617,0.008867502212524414,0.009128093719482422,0.015305280685424805,0.009104728698730469,0.009095191955566406,0.009429931640625,0.03239703178405762,0.0635077953338623,0.9902217388153076,0.3331596851348877,0.029981374740600586,0.05519270896911621,0.03045034408569336,0.05691385269165039,0.0567164421081543,0.05339217185974121,0.05433845520019531,0.05303955078125,0.05265617370605469,0.054837942123413086,0.054441213607788086,0.05346345901489258,0.08595991134643555,0.08831405639648438,1.0749998092651367,0.36482810974121094,0.05369138717651367,0.05478310585021973,0.0529170036315918,0.0539400577545166,0.053818702697753906 diff --git a/results/combined/merges_timed/robert-bor/csveed.csv b/results/combined/merges_timed/robert-bor/csveed.csv index 6d3de7a458..5579f94504 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,True,15,47,194,2,True,15,Tests_passed,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,True,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,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_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,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_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,3480576f2b1dcd096342354d851714bc39e9cd58a7cf510bae96d61e188e8cd1,Tests_failed,fb7c264c116683f9e14a541a07ed022ba8948df045ccb04c3c5fa05f873d13e4,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,0.049590349197387695,0.050989389419555664,0.061864376068115234,0.019272804260253906,0.041390419006347656,0.040387868881225586,0.038573265075683594,0.17391324043273926,0.10534238815307617,0.5910487174987793,0.4040071964263916,0.03879356384277344,0.05866599082946777,0.03894782066345215,0.06393742561340332,0.059197425842285156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,True,15,47,194,2,True,15,Tests_passed,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,True,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,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_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,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_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,3480576f2b1dcd096342354d851714bc39e9cd58a7cf510bae96d61e188e8cd1,Tests_failed,fb7c264c116683f9e14a541a07ed022ba8948df045ccb04c3c5fa05f873d13e4,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,0.049590349197387695,0.050989389419555664,0.061864376068115234,0.019272804260253906,0.041390419006347656,0.040387868881225586,0.038573265075683594,0.17391324043273926,0.10534238815307617,0.5910487174987793,0.4040071964263916,0.03879356384277344,0.05866599082946777,0.03894782066345215,0.06393742561340332,0.059197425842285156,0.06179928779602051,0.060480356216430664,0.06241345405578613,0.06411314010620117,0.05963635444641113,0.06273698806762695,0.06504631042480469,0.09935832023620605,0.0935826301574707,0.6180527210235596,0.44693636894226074,0.05756807327270508,0.06261873245239258,0.058893680572509766,0.06019234657287598,0.06312274932861328 diff --git a/results/combined/merges_timed/robobees/simbeeotic.csv b/results/combined/merges_timed/robobees/simbeeotic.csv index 8ea9b5b53b..762fc8d063 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,Tests_passed,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,True,13,144,836,4,True,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,True,13,True,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,394a5b5b7582767cd21bf0fbd0de2f0fed4bafc3e5b1db75d7ba496be32bf6dd,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,Merge_failed,b0f7fe2b66b24deff826b9a0bc43c5c5aec960b125a9e022b06da205b51429b3,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,e2e7dd0f5f4a58cbb2936496b3f23ec8ea8ceeb887d0e5cf661c541b5a65ebe0,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,4f0aedae2ed199f6e350b00d5a50ff57d2eb8a9733bbdba316e1c453200ab222,Tests_failed,f3ddd6481c40618b222e288e6bd402242d04edffb23776eacb297892a85e1088,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,0.014538288116455078,0.1210625171661377,0.12198090553283691,0.021041393280029297,0.12173843383789062,0.12233924865722656,0.11960315704345703,0.19703125953674316,0.19800329208374023,3.3615498542785645,0.8329930305480957,0.07335925102233887,0.07189297676086426,0.08261489868164062,0.08788728713989258,0.08831214904785156 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,Tests_passed,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,True,13,144,836,4,True,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,True,13,True,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,394a5b5b7582767cd21bf0fbd0de2f0fed4bafc3e5b1db75d7ba496be32bf6dd,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,Merge_failed,b0f7fe2b66b24deff826b9a0bc43c5c5aec960b125a9e022b06da205b51429b3,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,e2e7dd0f5f4a58cbb2936496b3f23ec8ea8ceeb887d0e5cf661c541b5a65ebe0,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,4f0aedae2ed199f6e350b00d5a50ff57d2eb8a9733bbdba316e1c453200ab222,Tests_failed,f3ddd6481c40618b222e288e6bd402242d04edffb23776eacb297892a85e1088,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,0.014538288116455078,0.1210625171661377,0.12198090553283691,0.021041393280029297,0.12173843383789062,0.12233924865722656,0.11960315704345703,0.19703125953674316,0.19800329208374023,3.3615498542785645,0.8329930305480957,0.07335925102233887,0.07189297676086426,0.08261489868164062,0.08788728713989258,0.08831214904785156,0.0888371467590332,0.08288908004760742,0.08625507354736328,0.09187746047973633,0.0857994556427002,0.08566808700561523,0.09193658828735352,0.15022754669189453,0.19035053253173828,3.544612407684326,0.9428174495697021,0.08835077285766602,0.08375835418701172,0.08797121047973633,0.0863180160522461,0.08434247970581055 diff --git a/results/combined/merges_timed/robotframework/javalibcore.csv b/results/combined/merges_timed/robotframework/javalibcore.csv index da05ad8fbf..8fad60a186 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,True,53,71,3957,2,True,53,Tests_passed,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,True,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,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,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,0.03501152992248535,0.04582476615905762,0.033421993255615234,0.019814014434814453,0.05124378204345703,0.05075383186340332,0.04888558387756348,0.14262795448303223,0.05163264274597168,0.04602789878845215,0.42282867431640625,0.042259931564331055,0.04362988471984863,0.04435276985168457,0.04513049125671387,0.0455477237701416 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,True,53,71,3957,2,True,53,Tests_passed,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,True,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,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,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,0.03501152992248535,0.04582476615905762,0.033421993255615234,0.019814014434814453,0.05124378204345703,0.05075383186340332,0.04888558387756348,0.14262795448303223,0.05163264274597168,0.04602789878845215,0.42282867431640625,0.042259931564331055,0.04362988471984863,0.04435276985168457,0.04513049125671387,0.0455477237701416,0.04373359680175781,0.042612552642822266,0.04421401023864746,0.04260134696960449,0.04190993309020996,0.04199051856994629,0.04397130012512207,0.06836533546447754,0.05182480812072754,0.05774211883544922,0.49425435066223145,0.04170942306518555,0.040125370025634766,0.04351353645324707,0.04100680351257324,0.04242229461669922 diff --git a/results/combined/merges_timed/robotiumtech/robotium.csv b/results/combined/merges_timed/robotiumtech/robotium.csv index e3ac7a4af8..4116712566 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,True,20,147,760,2,True,20,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,a343278b56b06dfa24c830ab3a031157efed7dd51f4d55c96879d9e89b913920,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,7c1cba6850863411d91aec2367776648cf1c7b29aef82a0675700e2a61bf05f5,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,42f12ed67478e24dc9fb673b704aa119c3efab8fb4f45e8f138c880211aa826b,Tests_failed,199542b3a7038a9943da8ea9f8979fcd764a7e6c20e80454a2b5f9f4fd8be13c,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.019420862197875977,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.10677576065063477,0.9639925956726074,0.8779711723327637,0.04821157455444336,0.047429800033569336,0.04656481742858887,0.04876065254211426,0.04959392547607422 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,True,20,147,760,2,True,20,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,a343278b56b06dfa24c830ab3a031157efed7dd51f4d55c96879d9e89b913920,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,7c1cba6850863411d91aec2367776648cf1c7b29aef82a0675700e2a61bf05f5,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,42f12ed67478e24dc9fb673b704aa119c3efab8fb4f45e8f138c880211aa826b,Tests_failed,199542b3a7038a9943da8ea9f8979fcd764a7e6c20e80454a2b5f9f4fd8be13c,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.019420862197875977,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.10677576065063477,0.9639925956726074,0.8779711723327637,0.04821157455444336,0.047429800033569336,0.04656481742858887,0.04876065254211426,0.04959392547607422,0.04810309410095215,0.04884028434753418,0.047701120376586914,0.04920244216918945,0.049329280853271484,0.047979116439819336,0.050400733947753906,0.08256316184997559,0.0901486873626709,1.0932722091674805,1.0330827236175537,0.04836702346801758,0.04875445365905762,0.04956173896789551,0.04761648178100586,0.04869413375854492 diff --git a/results/combined/merges_timed/robrua/orianna.csv b/results/combined/merges_timed/robrua/orianna.csv index 1ba45148de..d244ae0db1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,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,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,afc7c041e732acf0e8901d7a81d6cf5490e802bb29f78a79b9a343d8c8ec63e4,Tests_failed,77e2b4880def2302671ec37871f01e36d8ce7e431f32e2244e5ec9123195e80f,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,0.043892860412597656,0.045764923095703125,0.05271124839782715,0.03342151641845703,0.0498347282409668,0.013085365295410156,0.02253413200378418,0.16094493865966797,0.09457612037658691,1.1646265983581543,0.6426763534545898,0.03611922264099121,0.08096981048583984,0.05647730827331543,0.08366012573242188,0.06635832786560059 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,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,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,afc7c041e732acf0e8901d7a81d6cf5490e802bb29f78a79b9a343d8c8ec63e4,Tests_failed,77e2b4880def2302671ec37871f01e36d8ce7e431f32e2244e5ec9123195e80f,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,Tests_passed,c8881dc2255581009fc7ebd8dc044ce82a148587d60edd5a94e5bbb731200a34,0.043892860412597656,0.045764923095703125,0.05271124839782715,0.03342151641845703,0.0498347282409668,0.013085365295410156,0.02253413200378418,0.16094493865966797,0.09457612037658691,1.1646265983581543,0.6426763534545898,0.03611922264099121,0.08096981048583984,0.05647730827331543,0.08366012573242188,0.06635832786560059,0.08608531951904297,0.08107876777648926,0.08180093765258789,0.0819101333618164,0.08940649032592773,0.09158492088317871,0.08612680435180664,0.09860539436340332,0.12167644500732422,1.3494162559509277,0.7739262580871582,0.08477926254272461,0.0648655891418457,0.08135318756103516,0.08785104751586914,0.06551504135131836 diff --git a/results/combined/merges_timed/rocketscience-projects/javaslang.csv b/results/combined/merges_timed/rocketscience-projects/javaslang.csv index f969e643ba..092447cc69 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,True,331,1178,18550,8,True,331,Tests_passed,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,True,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,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,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,c62010f72ec855f315e85d63bbc69df68c55ffca0abd01b639cbef48e695b12b,Merge_failed,ac106f484b1dfe3135e7939f7f4b3ace12c54f31ae27539c3f6cfcc962b1aa44,Merge_failed,64cc6cfc5e2f329b23649d4912965165dcfdec11be2ff0975d22ef62966e2a49,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,0.07187533378601074,0.06670427322387695,0.07304763793945312,0.07826638221740723,0.0754232406616211,0.07819938659667969,0.07961392402648926,0.4189724922180176,0.46135687828063965,7.614904403686523,21.11718225479126,0.1235055923461914,0.29933786392211914,0.12057089805603027,0.29761648178100586,0.30257272720336914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,True,331,1178,18550,8,True,331,Tests_passed,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,True,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,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,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,c62010f72ec855f315e85d63bbc69df68c55ffca0abd01b639cbef48e695b12b,Merge_failed,ac106f484b1dfe3135e7939f7f4b3ace12c54f31ae27539c3f6cfcc962b1aa44,Merge_failed,64cc6cfc5e2f329b23649d4912965165dcfdec11be2ff0975d22ef62966e2a49,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,Merge_failed,b52d60587e1ced75ec6677903252de969081f2be75e31cb6280240bb144f3fd7,0.07187533378601074,0.06670427322387695,0.07304763793945312,0.07826638221740723,0.0754232406616211,0.07819938659667969,0.07961392402648926,0.4189724922180176,0.46135687828063965,7.614904403686523,21.11718225479126,0.1235055923461914,0.29933786392211914,0.12057089805603027,0.29761648178100586,0.30257272720336914,0.3156435489654541,0.30316591262817383,0.30647778511047363,0.3114469051361084,0.31278038024902344,0.31417417526245117,0.30958056449890137,0.5287065505981445,0.513636589050293,8.790865898132324,22.966447114944458,0.3007314205169678,0.2984578609466553,0.3019578456878662,0.3036682605743408,0.29806971549987793 diff --git a/results/combined/merges_timed/rometools/rome.csv b/results/combined/merges_timed/rometools/rome.csv index a7404868db..34093eb3e6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,True,112,231,638,2,True,112,Tests_passed,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,True,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,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_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,a34580e648aa6876812fd0152b36eafc0287a7a08e4a147e0e62b115919c0696,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,0.03630709648132324,0.032739877700805664,0.04429912567138672,0.03914690017700195,0.03151702880859375,0.033658504486083984,0.0391085147857666,0.11873912811279297,0.08716559410095215,0.0431210994720459,1.3751721382141113,0.07607316970825195,0.10296034812927246,0.07683157920837402,0.10606861114501953,0.10337209701538086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,True,112,231,638,2,True,112,Tests_passed,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,True,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,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_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,a34580e648aa6876812fd0152b36eafc0287a7a08e4a147e0e62b115919c0696,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,Tests_failed,3e2ced83874d5a8064464ac8a5d86c613d88cf9d75c29ff4a2b5e346fd88340d,0.03630709648132324,0.032739877700805664,0.04429912567138672,0.03914690017700195,0.03151702880859375,0.033658504486083984,0.0391085147857666,0.11873912811279297,0.08716559410095215,0.0431210994720459,1.3751721382141113,0.07607316970825195,0.10296034812927246,0.07683157920837402,0.10606861114501953,0.10337209701538086,0.09618806838989258,0.09484553337097168,0.10037565231323242,0.1043555736541748,0.10602355003356934,0.09741449356079102,0.09964156150817871,0.14779067039489746,0.13397860527038574,0.11430931091308594,1.4163827896118164,0.0969085693359375,0.0951089859008789,0.09256887435913086,0.09473419189453125,0.09526801109313965 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 eaba887225..b60aa6928d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,True,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,True,7,32,149,3,True,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,True,7,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,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,5eece481dedb22557d8ca08199e5819a0730cf4868df896c96438799c82e1f02,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,0.011383056640625,0.01169729232788086,0.012000560760498047,0.01803874969482422,0.011901617050170898,0.011997461318969727,0.012024402618408203,0.05214953422546387,0.12515568733215332,3.345703363418579,0.5100531578063965,0.032907962799072266,0.08951807022094727,0.03308367729187012,0.08701252937316895,0.08992481231689453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,True,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,True,7,32,149,3,True,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,True,7,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,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,5eece481dedb22557d8ca08199e5819a0730cf4868df896c96438799c82e1f02,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,Tests_passed,28955d88bfd9e4f999a46eb8058139c1f8e2dd5937d62b1ec7593483ac5d8219,0.011383056640625,0.01169729232788086,0.012000560760498047,0.01803874969482422,0.011901617050170898,0.011997461318969727,0.012024402618408203,0.05214953422546387,0.12515568733215332,3.345703363418579,0.5100531578063965,0.032907962799072266,0.08951807022094727,0.03308367729187012,0.08701252937316895,0.08992481231689453,0.08297562599182129,0.08538985252380371,0.0844426155090332,0.08463025093078613,0.08491349220275879,0.08453488349914551,0.08046531677246094,0.1354656219482422,0.13774704933166504,3.030400514602661,0.5226147174835205,0.0870974063873291,0.08449172973632812,0.0835881233215332,0.08246898651123047,0.08383488655090332 diff --git a/results/combined/merges_timed/roncoo/roncoo-pay.csv b/results/combined/merges_timed/roncoo/roncoo-pay.csv index fa9123b7fd..947f352d35 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,True,454,1016,81789.0,15,True,456,Tests_passed,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,True,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,True,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,bffba307306921b7593bceea518e05510a309b6499e94beb6a41d0b37c1f8cf1,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,Merge_failed,1182f815c8f324f15fc1855209bc44b02a918cd15d6d45b3b7a490907dbe16ab,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,4e9f23ce7ab1170fe05fc9e066e6c6920897753e6739c137081b03f719359013,Merge_failed,5185f5add93567934b082995e2bb78a85ce8de3385104922c0c2b4c64d2a79a6,Merge_failed,5185f5add93567934b082995e2bb78a85ce8de3385104922c0c2b4c64d2a79a6,Merge_failed,c51b9f12dadfe136386e2848fdf34b45aca9c2ad78ef94bdbbe453649a68a135,Merge_failed,cb33d66fb1f5e55f2282fb8cff366411e31ee167168d2e6664831a350c3b7ce5,Merge_failed,55359845abd28f97dabe8b39526bea800dc7f4c36c427a80264f0982cf63f7e8,Merge_failed,fa34194aef41c66e04182802763ad1a533c5504bab85073eaa8cbc15372dc4df,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.09309530258178711,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.9595131874084473,3.383166790008545,4.5080249309539795,0.2914700508117676,0.3577311038970947,0.32084178924560547,0.46019554138183594,0.36389827728271484 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,True,454,1016,81789.0,15,True,456,Tests_passed,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,True,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,True,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,bffba307306921b7593bceea518e05510a309b6499e94beb6a41d0b37c1f8cf1,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,Merge_failed,1182f815c8f324f15fc1855209bc44b02a918cd15d6d45b3b7a490907dbe16ab,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,4e9f23ce7ab1170fe05fc9e066e6c6920897753e6739c137081b03f719359013,Merge_failed,5185f5add93567934b082995e2bb78a85ce8de3385104922c0c2b4c64d2a79a6,Merge_failed,5185f5add93567934b082995e2bb78a85ce8de3385104922c0c2b4c64d2a79a6,Merge_failed,c51b9f12dadfe136386e2848fdf34b45aca9c2ad78ef94bdbbe453649a68a135,Merge_failed,cb33d66fb1f5e55f2282fb8cff366411e31ee167168d2e6664831a350c3b7ce5,Merge_failed,55359845abd28f97dabe8b39526bea800dc7f4c36c427a80264f0982cf63f7e8,Merge_failed,fa34194aef41c66e04182802763ad1a533c5504bab85073eaa8cbc15372dc4df,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,d21a272880175caaf7088d46c624193a5ff0cd9990d73cae55e8f546846233c2,Merge_failed,89d9352fdd63d308e44e223b0372877b3c5fc89cebc1a39a001259f780e643d9,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.09309530258178711,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.9595131874084473,3.383166790008545,4.5080249309539795,0.2914700508117676,0.3577311038970947,0.32084178924560547,0.46019554138183594,0.36389827728271484,0.442335844039917,0.3365328311920166,0.4223301410675049,0.353595495223999,0.45345592498779297,0.4503014087677002,0.45918822288513184,0.7072901725769043,0.8511273860931396,3.6322991847991943,4.941280841827393,0.41902828216552734,0.4359323978424072,0.44119858741760254,0.43749356269836426,0.34175825119018555 diff --git a/results/combined/merges_timed/rschreijer/lutung.csv b/results/combined/merges_timed/rschreijer/lutung.csv index e3e3370a3d..ccbadba388 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,True,True,Tests_passed,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,True,10,168,601,2,True,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,True,10,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,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,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,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,d4b668111c88742bab8e92f3a8604991a56346e2cb2dbb613d4865ffede1a9c7,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,0.052941322326660156,0.04083108901977539,0.05146288871765137,0.016213178634643555,0.04784440994262695,0.04294228553771973,0.04652261734008789,0.17083072662353516,0.11686921119689941,0.9065563678741455,0.5250186920166016,0.03502821922302246,0.0623774528503418,0.03533363342285156,0.06117868423461914,0.0617518424987793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,True,True,Tests_passed,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,True,10,168,601,2,True,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,True,10,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,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,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,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,d4b668111c88742bab8e92f3a8604991a56346e2cb2dbb613d4865ffede1a9c7,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,0.052941322326660156,0.04083108901977539,0.05146288871765137,0.016213178634643555,0.04784440994262695,0.04294228553771973,0.04652261734008789,0.17083072662353516,0.11686921119689941,0.9065563678741455,0.5250186920166016,0.03502821922302246,0.0623774528503418,0.03533363342285156,0.06117868423461914,0.0617518424987793,0.061553239822387695,0.05835533142089844,0.06065678596496582,0.06084012985229492,0.05957937240600586,0.06107687950134277,0.06273674964904785,0.0932464599609375,0.09083008766174316,0.9431304931640625,0.5623569488525391,0.05889558792114258,0.059421539306640625,0.05847525596618652,0.06123757362365723,0.059401512145996094 diff --git a/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv b/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv index 9827da5b19..e52339f102 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,True,True,True,4,5,16,5,True,5,Tests_passed,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,True,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,True,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,407bbf3e6d1c5ada81b2d459b23ef25666e9b6f3136ae6bc83a772c9fb9d3c75,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,70c11de955c04f8bf368521dbe8230c72f5002ef6b8775b9bbd196facbc513f4,Merge_failed,ad9ad3ca94f8b5168ae6b72618dce897f2c0137bc2c620f5fa5545c9f4b7f86a,Merge_failed,f177c9f329faf7ec9585364201d34f8664a2a2487521b554e0d31f576ca4b799,Tests_failed,5913f0bab870e6063a387f6e21d6baf76ae6bb05a786db04bbbe0abe5a714b94,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,0.008880615234375,0.008183479309082031,0.008372783660888672,0.013454675674438477,0.008391618728637695,0.008042335510253906,0.008249282836914062,0.06107211112976074,0.18434929847717285,1.525156021118164,0.26735615730285645,0.05026102066040039,0.06966233253479004,0.04993939399719238,0.07088923454284668,0.06946849822998047 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,True,True,True,4,5,16,5,True,5,Tests_passed,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,True,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,True,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,407bbf3e6d1c5ada81b2d459b23ef25666e9b6f3136ae6bc83a772c9fb9d3c75,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,70c11de955c04f8bf368521dbe8230c72f5002ef6b8775b9bbd196facbc513f4,Merge_failed,ad9ad3ca94f8b5168ae6b72618dce897f2c0137bc2c620f5fa5545c9f4b7f86a,Merge_failed,f177c9f329faf7ec9585364201d34f8664a2a2487521b554e0d31f576ca4b799,Tests_failed,5913f0bab870e6063a387f6e21d6baf76ae6bb05a786db04bbbe0abe5a714b94,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,Merge_failed,eca2ec5c964b8f6a37ef405093815d224d165067ab2188707cec848fa4b28602,0.008880615234375,0.008183479309082031,0.008372783660888672,0.013454675674438477,0.008391618728637695,0.008042335510253906,0.008249282836914062,0.06107211112976074,0.18434929847717285,1.525156021118164,0.26735615730285645,0.05026102066040039,0.06966233253479004,0.04993939399719238,0.07088923454284668,0.06946849822998047,0.06876587867736816,0.06720137596130371,0.06824302673339844,0.06567025184631348,0.06740093231201172,0.0668327808380127,0.0671083927154541,0.12662816047668457,0.14920520782470703,1.5262892246246338,0.36281657218933105,0.06849265098571777,0.0677788257598877,0.06710457801818848,0.06715512275695801,0.06702852249145508 diff --git a/results/combined/merges_timed/ru/casanova.csv b/results/combined/merges_timed/ru/casanova.csv index 08cd4b70f8..6650f6ed3b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,True,True,True,53,60,4468,2,True,53,Tests_passed,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,True,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,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_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,84122a5f5ca1ed3a5f729834e621ec90e1e0f4f3024289241f47c0a94dc2e943,Tests_passed,fee41d91e8137acf4b2056a540ad8276d8b954dc9ebdef175253d6de7629808f,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,0.027199506759643555,0.04771256446838379,0.03955221176147461,0.045877695083618164,0.05283522605895996,0.050324201583862305,0.06424975395202637,0.16228556632995605,0.10109663009643555,0.6705255508422852,0.32062745094299316,0.07282781600952148,0.09633779525756836,0.07394599914550781,0.09855890274047852,0.1037302017211914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,True,True,True,53,60,4468,2,True,53,Tests_passed,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,True,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,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_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,84122a5f5ca1ed3a5f729834e621ec90e1e0f4f3024289241f47c0a94dc2e943,Tests_passed,fee41d91e8137acf4b2056a540ad8276d8b954dc9ebdef175253d6de7629808f,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,3865068a251dfd986f90124638b1c5c637a711dcfbe4e03f189a7a6519b863c2,Tests_passed,0a9153b3c7384eb8816283efeb7d4e44b2c4fde6b54f123ce17d89db95bf296a,0.027199506759643555,0.04771256446838379,0.03955221176147461,0.045877695083618164,0.05283522605895996,0.050324201583862305,0.06424975395202637,0.16228556632995605,0.10109663009643555,0.6705255508422852,0.32062745094299316,0.07282781600952148,0.09633779525756836,0.07394599914550781,0.09855890274047852,0.1037302017211914,0.09895896911621094,0.0959007740020752,0.10334134101867676,0.1055595874786377,0.09726715087890625,0.10367631912231445,0.11075663566589355,0.14567112922668457,0.14066791534423828,0.7103958129882812,0.3889784812927246,0.09642672538757324,0.09596657752990723,0.09347105026245117,0.09404563903808594,0.09328579902648926 diff --git a/results/combined/merges_timed/rubenlagus/telegrambots.csv b/results/combined/merges_timed/rubenlagus/telegrambots.csv index d6165999e7..8833618196 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,True,41,151,2213,5,True,41,Tests_passed,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,True,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,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,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,Tests_passed,06f307bb1a43aeda461bdf49c8f0f6896d9248fb1799f228ef0a27851a3d8c6b,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_failed,be3dbf9d684943a4c4fb6403e89147eded9f055dcd1755c486cb94bac0427de3,Tests_failed,cf6b67cfa2be9362692f8d387103d141019679b07abfd9d045825f5f871ba85f,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.02318882942199707,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.27482008934020996,4.423612117767334,3.58838152885437,0.062462806701660156,0.14873576164245605,0.04982566833496094,0.13068556785583496,0.16756796836853027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,True,41,151,2213,5,True,41,Tests_passed,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,True,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,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,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,Tests_passed,06f307bb1a43aeda461bdf49c8f0f6896d9248fb1799f228ef0a27851a3d8c6b,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_failed,be3dbf9d684943a4c4fb6403e89147eded9f055dcd1755c486cb94bac0427de3,Tests_failed,cf6b67cfa2be9362692f8d387103d141019679b07abfd9d045825f5f871ba85f,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,ad8b531ab7d21d89d6f42b942b72184be6dcba64f6fb7d57d34d1ed2e81e1162,Tests_passed,9dc1734b7258d9265bcba5e0c846a736378da06c1f37a6dbf59ac500aec4e30a,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.02318882942199707,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.27482008934020996,4.423612117767334,3.58838152885437,0.062462806701660156,0.14873576164245605,0.04982566833496094,0.13068556785583496,0.16756796836853027,0.12409186363220215,0.12328100204467773,0.16130805015563965,0.12380337715148926,0.12588238716125488,0.16044950485229492,0.1271519660949707,0.2103586196899414,0.25118494033813477,4.2577173709869385,3.7522988319396973,0.1232595443725586,0.12398505210876465,0.15709662437438965,0.13063979148864746,0.12336444854736328 diff --git a/results/combined/merges_timed/ruedigermoeller/kontraktor.csv b/results/combined/merges_timed/ruedigermoeller/kontraktor.csv index 390f76eab4..40cfd93dc8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,True,20,52,474,3,True,21,Tests_passed,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,True,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,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,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,945a7ca06eb766a56c715d72ac49f2e7b0ad6aff83eb50ca6bbe4f9715bd4f3b,Tests_passed,42a20575e3a0039024d9ade9360389bbf0802d1cb3ae503fc9efc60b53c13de1,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,0.06696701049804688,0.05681037902832031,0.05919647216796875,0.02348637580871582,0.053261518478393555,0.04517054557800293,0.06209278106689453,0.19669556617736816,0.11977624893188477,1.070711612701416,0.5591239929199219,0.04714155197143555,0.07393741607666016,0.049443960189819336,0.07528948783874512,0.07973098754882812 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,True,20,52,474,3,True,21,Tests_passed,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,True,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,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,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,945a7ca06eb766a56c715d72ac49f2e7b0ad6aff83eb50ca6bbe4f9715bd4f3b,Tests_passed,42a20575e3a0039024d9ade9360389bbf0802d1cb3ae503fc9efc60b53c13de1,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,03c402534be3cd13b3298f6e2f8b7646e691d0db7515a0ab3ed7fb2c403b518d,Tests_passed,9a758e4833af65c3a5e167b6a3222a65b091f8f8a50655770ee65617be9fbd4d,0.06696701049804688,0.05681037902832031,0.05919647216796875,0.02348637580871582,0.053261518478393555,0.04517054557800293,0.06209278106689453,0.19669556617736816,0.11977624893188477,1.070711612701416,0.5591239929199219,0.04714155197143555,0.07393741607666016,0.049443960189819336,0.07528948783874512,0.07973098754882812,0.07225704193115234,0.07631421089172363,0.07854104042053223,0.08029389381408691,0.0776827335357666,0.07745599746704102,0.07917332649230957,0.11667180061340332,0.10981035232543945,1.227998971939087,0.6774685382843018,0.07362580299377441,0.07499361038208008,0.07571554183959961,0.07564592361450195,0.07895922660827637 diff --git a/results/combined/merges_timed/runeflobakk/motif.csv b/results/combined/merges_timed/runeflobakk/motif.csv index 3d0b1bb9b1..2dd504a1db 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,True,27,94,777,3,True,27,Tests_passed,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,True,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,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,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,318afaa650a7a433ba9ee0fa1fe17dbb9ce45f24886e1ff34a8b708e3d4d4581,Merge_timedout,,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,0.011472702026367188,0.011249542236328125,0.012975454330444336,0.01959967613220215,0.013503313064575195,0.013033151626586914,0.012988090515136719,0.05133938789367676,0.11944770812988281,1.323204517364502,-1.0,0.03702807426452637,0.0841975212097168,0.036705970764160156,0.08411026000976562,0.08347034454345703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,True,27,94,777,3,True,27,Tests_passed,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,True,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,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,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,318afaa650a7a433ba9ee0fa1fe17dbb9ce45f24886e1ff34a8b708e3d4d4581,Merge_timedout,,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,Tests_passed,7c1ddf1f8ddfa8268b5ad321f0aa0a48179cafda09a4e2c76481c28611624cac,0.011472702026367188,0.011249542236328125,0.012975454330444336,0.01959967613220215,0.013503313064575195,0.013033151626586914,0.012988090515136719,0.05133938789367676,0.11944770812988281,1.323204517364502,-1.0,0.03702807426452637,0.0841975212097168,0.036705970764160156,0.08411026000976562,0.08347034454345703,0.07941412925720215,0.08286428451538086,0.08598756790161133,0.08125185966491699,0.08304309844970703,0.08240437507629395,0.08315896987915039,0.1279289722442627,0.13805365562438965,1.437612771987915,-1.0,0.07889533042907715,0.07538819313049316,0.07960343360900879,0.08139157295227051,0.07994961738586426 diff --git a/results/combined/merges_timed/runelite/runelite.csv b/results/combined/merges_timed/runelite/runelite.csv index 9dea0ed7a9..538230b9aa 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,Tests_passed,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,True,219,1354,9917.0,2,True,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,True,219,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_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,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_failed,667f5ad77467538e756600430d79d280ba63db2eb7bdbe9b32864801c7d7d8c9,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.10427999496459961,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.13149070739746094,1.758108139038086,-1.0,0.14978814125061035,0.18982219696044922,0.15309548377990723,0.18378019332885742,0.19774866104125977 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,Tests_passed,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,True,219,1354,9917.0,2,True,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,True,219,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_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,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_failed,667f5ad77467538e756600430d79d280ba63db2eb7bdbe9b32864801c7d7d8c9,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.10427999496459961,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.13149070739746094,1.758108139038086,-1.0,0.14978814125061035,0.18982219696044922,0.15309548377990723,0.18378019332885742,0.19774866104125977,0.17729711532592773,0.1831498146057129,0.2065291404724121,0.2020275592803955,0.21140789985656738,0.21118402481079102,0.2048342227935791,0.2756938934326172,0.2331838607788086,1.7283520698547363,-1.0,0.1782383918762207,0.18851470947265625,0.18370270729064941,0.17426729202270508,0.17737746238708496 diff --git a/results/combined/merges_timed/ryantenney/metrics-spring.csv b/results/combined/merges_timed/ryantenney/metrics-spring.csv index 36114e34a2..357813eb78 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,True,75,171,1945,11,True,76,Tests_passed,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,True,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,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,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_timedout,,Merge_failed,ad5e7ace828b956b66430a228b959670cd82aeb989b912aab388d2bdab508aeb,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,652436197928fdc5af319b409d6a7b3e09c7428fab48c6fdfd74affcca754701,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,d005edae3cca374d1969abe284d2470c424708c60cc3755c75c564b9c6056a71,Merge_timedout,,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,0.031641244888305664,0.04033970832824707,0.036911725997924805,0.021958351135253906,0.021524906158447266,0.034440040588378906,0.02434682846069336,0.3970625400543213,0.6162712574005127,3.1117892265319824,-1.0,0.08080458641052246,0.20111632347106934,0.07388639450073242,0.20585083961486816,0.2157001495361328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,True,75,171,1945,11,True,76,Tests_passed,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,True,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,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,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_timedout,,Merge_failed,ad5e7ace828b956b66430a228b959670cd82aeb989b912aab388d2bdab508aeb,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,652436197928fdc5af319b409d6a7b3e09c7428fab48c6fdfd74affcca754701,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,d005edae3cca374d1969abe284d2470c424708c60cc3755c75c564b9c6056a71,Merge_timedout,,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,0.031641244888305664,0.04033970832824707,0.036911725997924805,0.021958351135253906,0.021524906158447266,0.034440040588378906,0.02434682846069336,0.3970625400543213,0.6162712574005127,3.1117892265319824,-1.0,0.08080458641052246,0.20111632347106934,0.07388639450073242,0.20585083961486816,0.2157001495361328,0.1923539638519287,0.19691133499145508,0.192854642868042,0.199601411819458,0.1961677074432373,0.19439911842346191,0.1934814453125,0.3709068298339844,0.470980167388916,3.134575366973877,-1.0,0.19191861152648926,0.1934521198272705,0.1951286792755127,0.1923363208770752,0.20028948783874512 diff --git a/results/combined/merges_timed/rylinaux/plugman.csv b/results/combined/merges_timed/rylinaux/plugman.csv index 1bcf5c01c7..2cc055e229 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,True,False,True,3,6,22,6,True,6,Tests_passed,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,True,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,True,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,82334ce55c1e61b8c0c1b52f5fa0786686ecae2f1108a6ba8fea9b798b3286f7,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,c67d2e859c088e17f1d6b85925a2797a8fe43e7e8e3a1647177df4f4a8257079,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,03a229fb74c8bff77b1a7208efddc242513d16493a7a1e8f4eec5412338dee9a,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,0.013731956481933594,0.0414731502532959,0.036864519119262695,0.015247344970703125,0.015032291412353516,0.04126167297363281,0.0380854606628418,0.23420453071594238,0.1683812141418457,0.6470465660095215,0.2673990726470947,0.05391263961791992,0.054540157318115234,0.052831411361694336,0.0564115047454834,0.05552816390991211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,True,False,True,3,6,22,6,True,6,Tests_passed,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,True,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,True,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,82334ce55c1e61b8c0c1b52f5fa0786686ecae2f1108a6ba8fea9b798b3286f7,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,c67d2e859c088e17f1d6b85925a2797a8fe43e7e8e3a1647177df4f4a8257079,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,03a229fb74c8bff77b1a7208efddc242513d16493a7a1e8f4eec5412338dee9a,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,0.013731956481933594,0.0414731502532959,0.036864519119262695,0.015247344970703125,0.015032291412353516,0.04126167297363281,0.0380854606628418,0.23420453071594238,0.1683812141418457,0.6470465660095215,0.2673990726470947,0.05391263961791992,0.054540157318115234,0.052831411361694336,0.0564115047454834,0.05552816390991211,0.05288958549499512,0.05256009101867676,0.05248570442199707,0.05525827407836914,0.05260419845581055,0.05505847930908203,0.05446004867553711,0.10240530967712402,0.11724114418029785,0.6958370208740234,0.3179953098297119,0.053559303283691406,0.0543363094329834,0.05318808555603027,0.054070234298706055,0.05398678779602051 diff --git a/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv b/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv index 1b1b3b206b..98021f9dfb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,True,10,62,839,2,True,10,Tests_passed,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,True,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,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,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,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,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,6d3ffaaf6a60cf71eaf37ab9b77d5fab9c53c6218cdd40dde47bb2f614ae1ea3,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,0.04601168632507324,0.04321694374084473,0.04431486129760742,0.027275562286376953,0.038786888122558594,0.04589557647705078,0.04889059066772461,0.1651134490966797,0.10788750648498535,0.6902163028717041,0.5452384948730469,0.05064797401428223,0.05913710594177246,0.05080246925354004,0.0749351978302002,0.06077218055725098 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,True,10,62,839,2,True,10,Tests_passed,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,True,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,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,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,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,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,6d3ffaaf6a60cf71eaf37ab9b77d5fab9c53c6218cdd40dde47bb2f614ae1ea3,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,0.04601168632507324,0.04321694374084473,0.04431486129760742,0.027275562286376953,0.038786888122558594,0.04589557647705078,0.04889059066772461,0.1651134490966797,0.10788750648498535,0.6902163028717041,0.5452384948730469,0.05064797401428223,0.05913710594177246,0.05080246925354004,0.0749351978302002,0.06077218055725098,0.07767724990844727,0.06413841247558594,0.07768940925598145,0.07723426818847656,0.061461687088012695,0.07849860191345215,0.08352446556091309,0.11724495887756348,0.10914826393127441,0.8396081924438477,0.6210932731628418,0.07753181457519531,0.07625985145568848,0.0708775520324707,0.0756080150604248,0.07347512245178223 diff --git a/results/combined/merges_timed/sachin-handiekar/jinstagram.csv b/results/combined/merges_timed/sachin-handiekar/jinstagram.csv index 8248be1c4a..8e80fa3d6e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,True,True,True,82,771,9732,2,True,82,Tests_passed,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,True,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,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,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,5f4c6fb53adcec998160ff98ceed2d6ccf16c71efe87b7aa67d33e1bc9f4b259,Tests_failed,be99d48010a0f60fec0a72b842e4d53d8dbd92d5dde25860e62afe295dfdbb3f,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,0.015666484832763672,0.014853954315185547,0.01722407341003418,0.024368762969970703,0.018180370330810547,0.017844200134277344,0.01782369613647461,0.04449820518493652,0.07184457778930664,0.5612952709197998,4.393582820892334,0.04459643363952637,0.0693199634552002,0.044770002365112305,0.07019233703613281,0.06474828720092773 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,True,True,True,82,771,9732,2,True,82,Tests_passed,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,True,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,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,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,5f4c6fb53adcec998160ff98ceed2d6ccf16c71efe87b7aa67d33e1bc9f4b259,Tests_failed,be99d48010a0f60fec0a72b842e4d53d8dbd92d5dde25860e62afe295dfdbb3f,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,Tests_passed,671b605a94d9261bdc96b90740017752e0918d9624a82c2b197e173c9344fd49,0.015666484832763672,0.014853954315185547,0.01722407341003418,0.024368762969970703,0.018180370330810547,0.017844200134277344,0.01782369613647461,0.04449820518493652,0.07184457778930664,0.5612952709197998,4.393582820892334,0.04459643363952637,0.0693199634552002,0.044770002365112305,0.07019233703613281,0.06474828720092773,0.06816911697387695,0.0650639533996582,0.06854128837585449,0.06805562973022461,0.07291698455810547,0.06488323211669922,0.0695347785949707,0.0998392105102539,0.10088682174682617,0.6007518768310547,4.440561771392822,0.06458783149719238,0.06400108337402344,0.0649118423461914,0.06420755386352539,0.06527900695800781 diff --git a/results/combined/merges_timed/sailthru/sailthru-java-client.csv b/results/combined/merges_timed/sailthru/sailthru-java-client.csv index d5b5467098..c78aa6e2d1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,True,15,39,267,2,True,15,Tests_passed,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,True,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,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,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,e2df1135192622ce26170f363d9fb3339107ece3e8e4dbdf2821a4bf207f9b88,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,76e425802040478baa625f3b4fb9ca78091803b49500023365a2175d1423ec22,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,0.009576082229614258,0.030141115188598633,0.04052925109863281,0.014371633529663086,0.04212784767150879,0.032663822174072266,0.027092695236206055,0.1670088768005371,0.10263562202453613,0.5490584373474121,0.3259775638580322,0.04012346267700195,0.04220294952392578,0.040518999099731445,0.04178929328918457,0.04215884208679199 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,True,15,39,267,2,True,15,Tests_passed,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,True,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,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,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,e2df1135192622ce26170f363d9fb3339107ece3e8e4dbdf2821a4bf207f9b88,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,76e425802040478baa625f3b4fb9ca78091803b49500023365a2175d1423ec22,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,0.009576082229614258,0.030141115188598633,0.04052925109863281,0.014371633529663086,0.04212784767150879,0.032663822174072266,0.027092695236206055,0.1670088768005371,0.10263562202453613,0.5490584373474121,0.3259775638580322,0.04012346267700195,0.04220294952392578,0.040518999099731445,0.04178929328918457,0.04215884208679199,0.04104781150817871,0.04220986366271973,0.04060554504394531,0.04119300842285156,0.04066944122314453,0.04143524169921875,0.03998208045959473,0.07313990592956543,0.09586071968078613,0.580251932144165,0.3926067352294922,0.0402531623840332,0.03951764106750488,0.04145050048828125,0.04131174087524414,0.041324615478515625 diff --git a/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv b/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv index 0c7e8eca99..515f6c89d4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,True,24,147,623,6,True,25,Tests_passed,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,True,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,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,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,f2fdeef7e551b7845dce187c6a48d2b24ff6185e6ecc785b87a8682d591a84aa,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,5d2a4d069ff89acc5eb7c169ea24c47e77c6ec8e6adb1af75866b8ce0f2b5087,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,534ae91518f0632e7a52367be09028bbbd4ebafdc9b6d79edf4b7b4783ee1b30,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,0.012491941452026367,0.012009620666503906,0.012743234634399414,0.020475387573242188,0.012820959091186523,0.012827157974243164,0.012740373611450195,0.07577943801879883,0.23171544075012207,0.7637197971343994,0.6568710803985596,0.06448984146118164,0.10092735290527344,0.05986380577087402,0.09951257705688477,0.09839153289794922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,True,24,147,623,6,True,25,Tests_passed,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,True,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,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,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,f2fdeef7e551b7845dce187c6a48d2b24ff6185e6ecc785b87a8682d591a84aa,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,5d2a4d069ff89acc5eb7c169ea24c47e77c6ec8e6adb1af75866b8ce0f2b5087,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,534ae91518f0632e7a52367be09028bbbd4ebafdc9b6d79edf4b7b4783ee1b30,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,0.012491941452026367,0.012009620666503906,0.012743234634399414,0.020475387573242188,0.012820959091186523,0.012827157974243164,0.012740373611450195,0.07577943801879883,0.23171544075012207,0.7637197971343994,0.6568710803985596,0.06448984146118164,0.10092735290527344,0.05986380577087402,0.09951257705688477,0.09839153289794922,0.09986639022827148,0.09905433654785156,0.10246801376342773,0.10000753402709961,0.09891748428344727,0.10192728042602539,0.0998983383178711,0.18607592582702637,0.22669506072998047,1.0130705833435059,0.8659801483154297,0.09810757637023926,0.09882092475891113,0.10071849822998047,0.09833621978759766,0.09695601463317871 diff --git a/results/combined/merges_timed/sammthomson/semafor.csv b/results/combined/merges_timed/sammthomson/semafor.csv index 31278e17b2..9059da71b1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,True,True,True,183,573,18288,86,True,223,Tests_passed,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,True,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,True,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,630cc8fc1402c6fb6d7ebc0f6c7409b58833f43456c599eb2076fcfd698de7db,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,Merge_failed,c174e9122f00532c1b1e52432ec0659447896ea121ef0c1733290a0555ee3e05,Merge_failed,427dc72d27aaef44d278b62e43c7eef4bd7ed6924f274d48b60bb51ca87ea338,Merge_failed,ccf0e352eb918151581c9e6813e485d43af1e156b1e22bc800713135ea9259c9,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,6f6df96756d5e4f6dae42057689f967e0e574387c4dbb0c118e85ecbe03c8870,Merge_failed,7db68bf26a37a20488f4fb9754d47f2987e450bf0d0d38e134449e1c6f1f14ba,Merge_failed,7db68bf26a37a20488f4fb9754d47f2987e450bf0d0d38e134449e1c6f1f14ba,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,faf735869675acfba506586c8e171661ee296fb2486ce417389b9f5684049034,Merge_failed,d04266ddb40c83d3d4fb2f0e0a35faaf7bd59fe4056efc33edf73dc0d8d29fe8,Merge_failed,ff5950cd330d686331e8650c4bf40ae7553bdd4595a8d1f9ffd7acd379789b69,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,0.03727293014526367,0.03716540336608887,0.052245140075683594,0.05767035484313965,0.05320882797241211,0.05187535285949707,0.051692962646484375,0.25905656814575195,0.5947272777557373,2.0264406204223633,2.054007053375244,0.16578030586242676,0.7007308006286621,0.17248821258544922,0.7125236988067627,0.7136592864990234 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,True,True,True,183,573,18288,86,True,223,Tests_passed,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,True,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,True,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,630cc8fc1402c6fb6d7ebc0f6c7409b58833f43456c599eb2076fcfd698de7db,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,Merge_failed,c174e9122f00532c1b1e52432ec0659447896ea121ef0c1733290a0555ee3e05,Merge_failed,427dc72d27aaef44d278b62e43c7eef4bd7ed6924f274d48b60bb51ca87ea338,Merge_failed,ccf0e352eb918151581c9e6813e485d43af1e156b1e22bc800713135ea9259c9,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,6f6df96756d5e4f6dae42057689f967e0e574387c4dbb0c118e85ecbe03c8870,Merge_failed,7db68bf26a37a20488f4fb9754d47f2987e450bf0d0d38e134449e1c6f1f14ba,Merge_failed,7db68bf26a37a20488f4fb9754d47f2987e450bf0d0d38e134449e1c6f1f14ba,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,faf735869675acfba506586c8e171661ee296fb2486ce417389b9f5684049034,Merge_failed,d04266ddb40c83d3d4fb2f0e0a35faaf7bd59fe4056efc33edf73dc0d8d29fe8,Merge_failed,ff5950cd330d686331e8650c4bf40ae7553bdd4595a8d1f9ffd7acd379789b69,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,cb142094bb769ccca78463c5623376f98f7b68d325a6bb867975b485b6c52787,Merge_failed,094fdf3d74563a1764589afe1bb7e3991c2d29362387e2f7703e726b56bf114d,0.03727293014526367,0.03716540336608887,0.052245140075683594,0.05767035484313965,0.05320882797241211,0.05187535285949707,0.051692962646484375,0.25905656814575195,0.5947272777557373,2.0264406204223633,2.054007053375244,0.16578030586242676,0.7007308006286621,0.17248821258544922,0.7125236988067627,0.7136592864990234,0.6486518383026123,0.709716796875,0.6464285850524902,0.6815781593322754,0.7300951480865479,0.6394777297973633,0.7196536064147949,0.8636667728424072,0.8725810050964355,2.6305551528930664,2.5924007892608643,0.6445369720458984,0.7018516063690186,0.6396129131317139,0.7079799175262451,0.695418119430542 diff --git a/results/combined/merges_timed/samskivert/jmustache.csv b/results/combined/merges_timed/samskivert/jmustache.csv index ecfb43d288..d40bb04936 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,True,True,Tests_passed,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,True,9,40,297,2,True,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,True,9,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,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,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,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,c27993eb440139068aac3200a3042c2fa372c3fcb115fcfb8569d37d1b0c7912,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,0.049575090408325195,0.03847074508666992,0.04694533348083496,0.017355918884277344,0.049124956130981445,0.04333782196044922,0.04963040351867676,0.17274999618530273,0.11419439315795898,1.864311695098877,0.6583638191223145,0.03524303436279297,0.06518769264221191,0.03596901893615723,0.06477904319763184,0.06454014778137207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,True,True,Tests_passed,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,True,9,40,297,2,True,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,True,9,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,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,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,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,c27993eb440139068aac3200a3042c2fa372c3fcb115fcfb8569d37d1b0c7912,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,0.049575090408325195,0.03847074508666992,0.04694533348083496,0.017355918884277344,0.049124956130981445,0.04333782196044922,0.04963040351867676,0.17274999618530273,0.11419439315795898,1.864311695098877,0.6583638191223145,0.03524303436279297,0.06518769264221191,0.03596901893615723,0.06477904319763184,0.06454014778137207,0.062340497970581055,0.06320905685424805,0.06269121170043945,0.06453943252563477,0.06651687622070312,0.06453680992126465,0.06637239456176758,0.09445405006408691,0.09528326988220215,1.761340856552124,0.7181758880615234,0.06164240837097168,0.06197404861450195,0.06332921981811523,0.06232500076293945,0.06381869316101074 diff --git a/results/combined/merges_timed/samskivert/pythagoras.csv b/results/combined/merges_timed/samskivert/pythagoras.csv index c4ea8ff78e..c683824dce 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,True,True,Tests_passed,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,True,53,87,1125,4,True,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,True,53,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,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,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,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,25182d25e95cbe45b832971ca0682b458a31f6cc5de02fb56e34331941e1d40a,Tests_failed,cc77c6fecd035ca6a3d71d1e51fce44e66e3b9184866b26a718ba995f662a9c6,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,0.05650043487548828,0.061684370040893555,0.055864810943603516,0.02568364143371582,0.05172228813171387,0.06251335144042969,0.06187105178833008,0.2819046974182129,0.22982025146484375,3.7207083702087402,0.8484389781951904,0.04133462905883789,0.12254047393798828,0.04420137405395508,0.12283110618591309,0.11118865013122559 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,True,True,Tests_passed,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,True,53,87,1125,4,True,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,True,53,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,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,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,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,25182d25e95cbe45b832971ca0682b458a31f6cc5de02fb56e34331941e1d40a,Tests_failed,cc77c6fecd035ca6a3d71d1e51fce44e66e3b9184866b26a718ba995f662a9c6,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,0.05650043487548828,0.061684370040893555,0.055864810943603516,0.02568364143371582,0.05172228813171387,0.06251335144042969,0.06187105178833008,0.2819046974182129,0.22982025146484375,3.7207083702087402,0.8484389781951904,0.04133462905883789,0.12254047393798828,0.04420137405395508,0.12283110618591309,0.11118865013122559,0.10793733596801758,0.11468958854675293,0.11308145523071289,0.1145772933959961,0.11156320571899414,0.11316585540771484,0.1150205135345459,0.18862247467041016,0.1913602352142334,3.699408531188965,0.9026024341583252,0.11123013496398926,0.11275339126586914,0.11097836494445801,0.11390876770019531,0.10922718048095703 diff --git a/results/combined/merges_timed/samskivert/samskivert.csv b/results/combined/merges_timed/samskivert/samskivert.csv index 51f9d52af4..b615ca24d6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,False,True,6,15,39,2,True,6,Tests_passed,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,True,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,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,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,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,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,83eead89e885a68da31b04cb4a0c2edcd16349e1525076c31f7ce5c6211da140,Tests_failed,dcf01861fb39e0e697f7806c08311b3d4ba3f970e48d955bf2b800a91f9b9e1c,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,0.011094093322753906,0.023093700408935547,0.02966451644897461,0.0163726806640625,0.011029243469238281,0.02857518196105957,0.028960227966308594,0.06164383888244629,0.06848812103271484,0.9480438232421875,0.3717832565307617,0.03255653381347656,0.05603766441345215,0.03201127052307129,0.05519866943359375,0.05658888816833496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,False,True,6,15,39,2,True,6,Tests_passed,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,True,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,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,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,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,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,83eead89e885a68da31b04cb4a0c2edcd16349e1525076c31f7ce5c6211da140,Tests_failed,dcf01861fb39e0e697f7806c08311b3d4ba3f970e48d955bf2b800a91f9b9e1c,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,0.011094093322753906,0.023093700408935547,0.02966451644897461,0.0163726806640625,0.011029243469238281,0.02857518196105957,0.028960227966308594,0.06164383888244629,0.06848812103271484,0.9480438232421875,0.3717832565307617,0.03255653381347656,0.05603766441345215,0.03201127052307129,0.05519866943359375,0.05658888816833496,0.055605173110961914,0.05441927909851074,0.054594993591308594,0.0557248592376709,0.0554659366607666,0.05471396446228027,0.06418991088867188,0.09510254859924316,0.08489608764648438,0.9842462539672852,0.40422606468200684,0.08703064918518066,0.08618807792663574,0.07674741744995117,0.07295370101928711,0.07485175132751465 diff --git a/results/combined/merges_timed/sander2798/enderstone.csv b/results/combined/merges_timed/sander2798/enderstone.csv index 701e500b7a..6a68b25fa2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -99,refs/heads/master,27f9c43869468a75a469b9d40b3e3e946da5c687,36b08dfce06b1bcc1db0c53ab0d0f2b59cfd659f,f4902dea1ad7f177a300c4cbb7c277a64a9c4cfc,,True,,True,55,165,,5,True,55,Tests_passed,7a2fdde0c9906c9993e90b50ffa6803141280240605c810fbb3258da579b9eae,True,Tests_passed,d3ca35b59a9aa89336ed7b328458e219d7050b4e24073d91fd2732d1533ffa88,True,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,126af9e6e901a0972448150c690a6b389362701ef4b2443666db54624d3a7309,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,14b31f3efa0e86d709cf0ba43305a0fbb88055bb1166de77d85a2ef9a71bb7ad,Merge_failed,c47aa4b015b6b948933ac06c41a18b8684929ead3b24bf094694c2258822d096,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,a60031252155b5534f97a07ac01033458ea705dcbe24f4d0fd0ed54a45eba402,Merge_failed,2049a3101ce6032a73a0fc80cf02c630dbe8a45b31d9bb6a8144a367171b06c6,Tests_passed,9002adbb71cd0916606f466b78321e407f9561d6b28a03ec178c159e7f8b2cd7,Tests_failed,925a489b935e751715933ac44965fc203f60127962df4db3300db7120e287d66,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,0.047823429107666016,0.04610919952392578,0.053949832916259766,0.01895427703857422,0.04827761650085449,0.047757625579833984,0.055533647537231445,0.3588130474090576,0.296022891998291,3.302981376647949,0.6403002738952637,0.0639653205871582,0.11034345626831055,0.059189796447753906,0.11158418655395508,0.11275863647460938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +99,refs/heads/master,27f9c43869468a75a469b9d40b3e3e946da5c687,36b08dfce06b1bcc1db0c53ab0d0f2b59cfd659f,f4902dea1ad7f177a300c4cbb7c277a64a9c4cfc,,True,,True,55,165,,5,True,55,Tests_passed,7a2fdde0c9906c9993e90b50ffa6803141280240605c810fbb3258da579b9eae,True,Tests_passed,d3ca35b59a9aa89336ed7b328458e219d7050b4e24073d91fd2732d1533ffa88,True,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,126af9e6e901a0972448150c690a6b389362701ef4b2443666db54624d3a7309,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,14b31f3efa0e86d709cf0ba43305a0fbb88055bb1166de77d85a2ef9a71bb7ad,Merge_failed,c47aa4b015b6b948933ac06c41a18b8684929ead3b24bf094694c2258822d096,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,a60031252155b5534f97a07ac01033458ea705dcbe24f4d0fd0ed54a45eba402,Merge_failed,2049a3101ce6032a73a0fc80cf02c630dbe8a45b31d9bb6a8144a367171b06c6,Tests_passed,9002adbb71cd0916606f466b78321e407f9561d6b28a03ec178c159e7f8b2cd7,Tests_failed,925a489b935e751715933ac44965fc203f60127962df4db3300db7120e287d66,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,80888bb7f1e9f66e1e195ffd5d0eb4f0f65c5d8756229e42d5f225c8ce59a561,Merge_failed,c102a4523db2e846b55c91370e8320a101304659583420c90d5d24572fe31cd3,0.047823429107666016,0.04610919952392578,0.053949832916259766,0.01895427703857422,0.04827761650085449,0.047757625579833984,0.055533647537231445,0.3588130474090576,0.296022891998291,3.302981376647949,0.6403002738952637,0.0639653205871582,0.11034345626831055,0.059189796447753906,0.11158418655395508,0.11275863647460938,0.11078214645385742,0.11103153228759766,0.11443114280700684,0.11139416694641113,0.11129999160766602,0.11139917373657227,0.11329507827758789,0.19249296188354492,0.23301982879638672,3.679419994354248,0.8128600120544434,0.1081843376159668,0.11460351943969727,0.11072707176208496,0.11214256286621094,0.11031532287597656 diff --git a/results/combined/merges_timed/sandergielisse/enderstone.csv b/results/combined/merges_timed/sandergielisse/enderstone.csv index 666d86fae3..67d46c68bc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -102,refs/heads/master,7e7c2aae079a09a93b1d3811f8a1111a5e60d991,6a8556dc171591cb769f7b2485fd15118eee8230,615f68f0fd9d5b6b91d84ef4977586f6e442a04e,,True,True,True,6,22,464.0,2,True,6,Tests_passed,ec75da5ea2cdd38f3818529c0d9ca8ed06cc0f2c48412af89b3e7ba8d8b18439,True,Tests_passed,a999b9317237e00a1d31abc53c6bf985dc1432379483afacada2910fc3da4891,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,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,d6fc330b13629b07a28c948dba3c8f46ec396a51ee5dd21af05a193427231a36,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,e68723ea0daed5e91a6bab15b46ea7bdf14d457abbf7fdb9600e7887f304293c,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Tests_failed,0e4314409bdf07ecd9d0d0251c145a69fd11d85754fe7e29b454fbbd79361456,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,0.036665916442871094,0.04160928726196289,0.028784513473510742,0.01565837860107422,0.03448081016540527,0.04143643379211426,0.04108548164367676,0.16999602317810059,0.11867618560791016,0.8917727470397949,0.4736473560333252,0.043639183044433594,0.04486513137817383,0.0435941219329834,0.04459333419799805,0.04336428642272949 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +102,refs/heads/master,7e7c2aae079a09a93b1d3811f8a1111a5e60d991,6a8556dc171591cb769f7b2485fd15118eee8230,615f68f0fd9d5b6b91d84ef4977586f6e442a04e,,True,True,True,6,22,464.0,2,True,6,Tests_passed,ec75da5ea2cdd38f3818529c0d9ca8ed06cc0f2c48412af89b3e7ba8d8b18439,True,Tests_passed,a999b9317237e00a1d31abc53c6bf985dc1432379483afacada2910fc3da4891,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,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,d6fc330b13629b07a28c948dba3c8f46ec396a51ee5dd21af05a193427231a36,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,e68723ea0daed5e91a6bab15b46ea7bdf14d457abbf7fdb9600e7887f304293c,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Tests_failed,0e4314409bdf07ecd9d0d0251c145a69fd11d85754fe7e29b454fbbd79361456,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,0.036665916442871094,0.04160928726196289,0.028784513473510742,0.01565837860107422,0.03448081016540527,0.04143643379211426,0.04108548164367676,0.16999602317810059,0.11867618560791016,0.8917727470397949,0.4736473560333252,0.043639183044433594,0.04486513137817383,0.0435941219329834,0.04459333419799805,0.04336428642272949,0.046033620834350586,0.045172929763793945,0.04420185089111328,0.0461735725402832,0.045809030532836914,0.04418349266052246,0.04476118087768555,0.07843279838562012,0.08664321899414062,0.9300882816314697,0.6033322811126709,0.04593849182128906,0.046334266662597656,0.04354429244995117,0.04463481903076172,0.04613471031188965 diff --git a/results/combined/merges_timed/saucelabs/ci-sauce.csv b/results/combined/merges_timed/saucelabs/ci-sauce.csv index 6b6e377efe..14a2eb03ec 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,Tests_passed,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,True,4.0,8,24.0,2,True,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,True,4,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,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,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,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,a2aad5f6a2bc068b5aa8052f41a3668bf8c3c8a0992e285aee84a35b41eda053,Tests_failed,6ba0cf18b1635468e625f3f40419948a2614b78ddf01312f004bab0ffb199c9c,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,0.13714170455932617,0.13630437850952148,0.1972336769104004,0.01718425750732422,0.19876956939697266,0.19763970375061035,0.1368250846862793,0.2197704315185547,0.18990278244018555,1.2191381454467773,0.4247748851776123,0.16242003440856934,0.18265175819396973,0.16793584823608398,0.06081676483154297,0.061713457107543945 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,Tests_passed,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,True,4.0,8,24.0,2,True,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,True,4,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,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,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,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,a2aad5f6a2bc068b5aa8052f41a3668bf8c3c8a0992e285aee84a35b41eda053,Tests_failed,6ba0cf18b1635468e625f3f40419948a2614b78ddf01312f004bab0ffb199c9c,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,0.13714170455932617,0.13630437850952148,0.1972336769104004,0.01718425750732422,0.19876956939697266,0.19763970375061035,0.1368250846862793,0.2197704315185547,0.18990278244018555,1.2191381454467773,0.4247748851776123,0.16242003440856934,0.18265175819396973,0.16793584823608398,0.06081676483154297,0.061713457107543945,0.19443750381469727,0.18416047096252441,0.18804192543029785,0.18366146087646484,0.18360090255737305,0.18886089324951172,0.18617606163024902,0.2135629653930664,0.09090662002563477,1.1892945766448975,0.4612767696380615,0.060302019119262695,0.18446946144104004,0.1863112449645996,0.1894683837890625,0.18300747871398926 diff --git a/results/combined/merges_timed/sbtourist/journal.io.csv b/results/combined/merges_timed/sbtourist/journal.io.csv index 3b8aab8b54..f274e3bb80 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,True,5,10,51,2,True,5,Tests_passed,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,True,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,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,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,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,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,7c3961ed2549e3bdfb6a61cceb5f6ad324ad69dc481d3bd70311dd8d2bbe0f9f,Tests_failed,7cc21a9dbaacde7ad23505a490bbd65fb961802af3e1a5368c557828ac689e4c,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,0.01446080207824707,0.04899263381958008,0.04634356498718262,0.025678157806396484,0.04824495315551758,0.061363935470581055,0.04815316200256348,0.1651003360748291,0.10224199295043945,1.7110404968261719,0.4245026111602783,0.04352164268493652,0.07181310653686523,0.044873952865600586,0.07147049903869629,0.07393622398376465 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,True,5,10,51,2,True,5,Tests_passed,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,True,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,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,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,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,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,7c3961ed2549e3bdfb6a61cceb5f6ad324ad69dc481d3bd70311dd8d2bbe0f9f,Tests_failed,7cc21a9dbaacde7ad23505a490bbd65fb961802af3e1a5368c557828ac689e4c,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,0.01446080207824707,0.04899263381958008,0.04634356498718262,0.025678157806396484,0.04824495315551758,0.061363935470581055,0.04815316200256348,0.1651003360748291,0.10224199295043945,1.7110404968261719,0.4245026111602783,0.04352164268493652,0.07181310653686523,0.044873952865600586,0.07147049903869629,0.07393622398376465,0.07147359848022461,0.0689077377319336,0.07607650756835938,0.07300043106079102,0.07367587089538574,0.07315945625305176,0.07210993766784668,0.10902810096740723,0.10282349586486816,1.7050659656524658,0.48809361457824707,0.0720362663269043,0.07008934020996094,0.07052350044250488,0.07016277313232422,0.07372593879699707 diff --git a/results/combined/merges_timed/schema-repo/schema-repo.csv b/results/combined/merges_timed/schema-repo/schema-repo.csv index 3e84df751c..11950a6b26 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,True,True,True,10,23,110,23,True,25,Tests_passed,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,True,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,True,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,9d9993feb89e5617e28c8bd0e73702e705d86c9c757d14698a11ef57dd312f8f,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,7787e8be35954d29e9b456d980f83efdae174acfad6c85e8474af1b1b16cea47,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,44d191db7ec6f083996f8271ae651bb8f6a701211cbf5e421e78abf5868df397,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,0.045438528060913086,0.043648719787597656,0.049162864685058594,0.017697572708129883,0.055777788162231445,0.05204367637634277,0.04569721221923828,0.5482721328735352,0.46456432342529297,1.9948866367340088,0.6181650161743164,0.0770878791809082,0.11716198921203613,0.07707381248474121,0.11505866050720215,0.11836791038513184 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,True,True,True,10,23,110,23,True,25,Tests_passed,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,True,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,True,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,9d9993feb89e5617e28c8bd0e73702e705d86c9c757d14698a11ef57dd312f8f,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,7787e8be35954d29e9b456d980f83efdae174acfad6c85e8474af1b1b16cea47,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,44d191db7ec6f083996f8271ae651bb8f6a701211cbf5e421e78abf5868df397,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,0.045438528060913086,0.043648719787597656,0.049162864685058594,0.017697572708129883,0.055777788162231445,0.05204367637634277,0.04569721221923828,0.5482721328735352,0.46456432342529297,1.9948866367340088,0.6181650161743164,0.0770878791809082,0.11716198921203613,0.07707381248474121,0.11505866050720215,0.11836791038513184,0.11876630783081055,0.12038564682006836,0.11986398696899414,0.11971211433410645,0.12197113037109375,0.1199336051940918,0.11772441864013672,0.25246644020080566,0.32198643684387207,2.2189671993255615,0.8079507350921631,0.12104558944702148,0.12087249755859375,0.11969327926635742,0.12117934226989746,0.11561369895935059 diff --git a/results/combined/merges_timed/scifio/scifio.csv b/results/combined/merges_timed/scifio/scifio.csv index bc088f3447..f2600356df 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,True,335,370,1016.0,3,True,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,True,335,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,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,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,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,bf22e84f199f091c235603e37e05025e5c4333195606533014a9392f59ff3a6d,Merge_timedout,,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,0.045686960220336914,0.05408120155334473,0.06567049026489258,0.05607104301452637,0.055480003356933594,0.05959606170654297,0.062175750732421875,0.21261835098266602,0.160416841506958,1.3496289253234863,-1.0,0.09230637550354004,0.1399211883544922,0.09058284759521484,0.13935184478759766,0.14229154586791992 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,True,335,370,1016.0,3,True,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,True,335,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,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,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,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,bf22e84f199f091c235603e37e05025e5c4333195606533014a9392f59ff3a6d,Merge_timedout,,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,0.045686960220336914,0.05408120155334473,0.06567049026489258,0.05607104301452637,0.055480003356933594,0.05959606170654297,0.062175750732421875,0.21261835098266602,0.160416841506958,1.3496289253234863,-1.0,0.09230637550354004,0.1399211883544922,0.09058284759521484,0.13935184478759766,0.14229154586791992,0.12946557998657227,0.12923979759216309,0.14638972282409668,0.14591455459594727,0.14017868041992188,0.14089679718017578,0.14627313613891602,0.21401190757751465,0.1971735954284668,1.4401795864105225,-1.0,0.1348421573638916,0.13633275032043457,0.13154888153076172,0.1355113983154297,0.13185644149780273 diff --git a/results/combined/merges_timed/scribble/scribble-java.csv b/results/combined/merges_timed/scribble/scribble-java.csv index c2a497d0c2..baafe2b5f5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,True,49,132,996,3,True,50,Tests_passed,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,True,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,1557bd724e43000449b11c959e03d2c3b1398314a06ed9c3a355dfbc61803e22,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_timedout,,Tests_passed,59c2167aae4b01e026c8dd44c4d07f2bfa81499aa60d7772f75f81441a370522,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,b7faf8951d62ea85b7d7d7f8d5ca295c8f82fd4ef24a8311a5ab12f06fac4304,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,9ab65097db2d0bb16ba7572069fc726b699ff9c23b79b8882a341ddcff505caa,Merge_timedout,,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,0.04323387145996094,0.04462933540344238,0.05592060089111328,0.02344202995300293,0.06730365753173828,0.03790402412414551,0.05307173728942871,0.2932107448577881,0.23778486251831055,2.908494472503662,-1.0,0.07573390007019043,0.0727231502532959,0.0583033561706543,0.07258462905883789,0.07465291023254395 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,True,49,132,996,3,True,50,Tests_passed,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,True,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,1557bd724e43000449b11c959e03d2c3b1398314a06ed9c3a355dfbc61803e22,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_timedout,,Tests_passed,59c2167aae4b01e026c8dd44c4d07f2bfa81499aa60d7772f75f81441a370522,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,b7faf8951d62ea85b7d7d7f8d5ca295c8f82fd4ef24a8311a5ab12f06fac4304,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,9ab65097db2d0bb16ba7572069fc726b699ff9c23b79b8882a341ddcff505caa,Merge_timedout,,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,a020ffe2bed1a05692af7f6533afab22643a9872f91b008ab8dc9b9a3fdefb10,Merge_failed,1ac08d94587f56e06d029bf80ff3817cfc9eb4134d269dfcf0503e55281791ee,0.04323387145996094,0.04462933540344238,0.05592060089111328,0.02344202995300293,0.06730365753173828,0.03790402412414551,0.05307173728942871,0.2932107448577881,0.23778486251831055,2.908494472503662,-1.0,0.07573390007019043,0.0727231502532959,0.0583033561706543,0.07258462905883789,0.07465291023254395,0.0704953670501709,0.07068729400634766,0.07223987579345703,0.07095932960510254,0.07141733169555664,0.06949830055236816,0.06987738609313965,0.12719106674194336,0.15811967849731445,2.9084312915802,-1.0,0.06743597984313965,0.06864356994628906,0.06772804260253906,0.06944084167480469,0.06806063652038574 diff --git a/results/combined/merges_timed/scribejava/scribejava.csv b/results/combined/merges_timed/scribejava/scribejava.csv index 8647a1359a..ffd5a75159 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,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,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,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_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,33b89cf2bfadb65308a2f05d410f8eb80520274893169f6937cf88f788803bba,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.03356027603149414,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.12111067771911621,1.0731663703918457,1.183617115020752,0.046808481216430664,0.07569599151611328,0.04555511474609375,0.08375930786132812,0.08923983573913574 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,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,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,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_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,33b89cf2bfadb65308a2f05d410f8eb80520274893169f6937cf88f788803bba,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.03356027603149414,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.12111067771911621,1.0731663703918457,1.183617115020752,0.046808481216430664,0.07569599151611328,0.04555511474609375,0.08375930786132812,0.08923983573913574,0.06877994537353516,0.08053016662597656,0.0846710205078125,0.07262039184570312,0.0713338851928711,0.07636737823486328,0.08660721778869629,0.12634634971618652,0.11818504333496094,1.0574631690979004,1.196465253829956,0.07058382034301758,0.07097244262695312,0.07193326950073242,0.08177495002746582,0.08059072494506836 diff --git a/results/combined/merges_timed/sd4324530/fastweixin.csv b/results/combined/merges_timed/sd4324530/fastweixin.csv index 1ee949cfa8..ed4f65de22 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,Tests_passed,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,True,33,139,966.0,4,True,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,True,33,True,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,43382d7d3757c6beb3fffaf37d759bff9983f30f6d9f7d1988a849f318d8b337,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,3ea7fa62f444a259e41e57aa5dd91b4b7a91123db939c7ced5dba83c959cc5be,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,b0af6641862910aa2d513cfe3384033b127d8456926eec62bfa9a45733a86cd8,Tests_failed,3d13fcc6b2abcd9fdf1f4e2e7c3b37a2834a67ea91b763eb959bf5e91916d309,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,0.03698539733886719,0.04671454429626465,0.05628323554992676,0.022404193878173828,0.03972887992858887,0.055013179779052734,0.02562260627746582,0.29799938201904297,0.24357271194458008,1.7471787929534912,0.5181500911712646,0.04610943794250488,0.0912940502166748,0.04998302459716797,0.08840394020080566,0.08469343185424805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,Tests_passed,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,True,33,139,966.0,4,True,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,True,33,True,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,43382d7d3757c6beb3fffaf37d759bff9983f30f6d9f7d1988a849f318d8b337,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,3ea7fa62f444a259e41e57aa5dd91b4b7a91123db939c7ced5dba83c959cc5be,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,b0af6641862910aa2d513cfe3384033b127d8456926eec62bfa9a45733a86cd8,Tests_failed,3d13fcc6b2abcd9fdf1f4e2e7c3b37a2834a67ea91b763eb959bf5e91916d309,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,0.03698539733886719,0.04671454429626465,0.05628323554992676,0.022404193878173828,0.03972887992858887,0.055013179779052734,0.02562260627746582,0.29799938201904297,0.24357271194458008,1.7471787929534912,0.5181500911712646,0.04610943794250488,0.0912940502166748,0.04998302459716797,0.08840394020080566,0.08469343185424805,0.08399081230163574,0.09044003486633301,0.09292125701904297,0.09001302719116211,0.09148430824279785,0.0834357738494873,0.09224081039428711,0.16270899772644043,0.17810821533203125,1.9522554874420166,0.6902034282684326,0.0924220085144043,0.08856582641601562,0.09060049057006836,0.08966398239135742,0.08388400077819824 diff --git a/results/combined/merges_timed/sdllanguagetechnologies/testy.csv b/results/combined/merges_timed/sdllanguagetechnologies/testy.csv index 602124a7d3..b0bc48c063 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -101,refs/heads/master,0bf477ccc77a6520539fe7e11709e07be71f85ae,1d0cfa99fb9f6603805e823f19d5b92bed401406,929cf45ec065c4cc0fa4ff743ff74c29a779d253,,True,False,True,10,14,44,2,True,10,Tests_passed,a840952329a3c1687284edc4df81aaa85b2898329208ac0d7083c27078709552,True,Tests_passed,5a8e4d345c41403be5c479598c4e8a3cdbc62d17ea753b6c7c495ff082dd4019,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,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,bd12b56acbab20bdb8775b709f8d031d574bec0f1461aeb3a73713c3e7612e4c,Tests_passed,ff7f9983f0cde03c16d891e205197941f4fdbd8ea5d16c18e1019ea5312c3b36,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,0.03060436248779297,0.05168795585632324,0.0533297061920166,0.017643451690673828,0.012773513793945312,0.04325389862060547,0.012861490249633789,0.09770464897155762,0.06959891319274902,1.1076595783233643,0.4608135223388672,0.18973517417907715,0.17059588432312012,0.18232059478759766,0.1792616844177246,0.17852234840393066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +101,refs/heads/master,0bf477ccc77a6520539fe7e11709e07be71f85ae,1d0cfa99fb9f6603805e823f19d5b92bed401406,929cf45ec065c4cc0fa4ff743ff74c29a779d253,,True,False,True,10,14,44,2,True,10,Tests_passed,a840952329a3c1687284edc4df81aaa85b2898329208ac0d7083c27078709552,True,Tests_passed,5a8e4d345c41403be5c479598c4e8a3cdbc62d17ea753b6c7c495ff082dd4019,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,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,bd12b56acbab20bdb8775b709f8d031d574bec0f1461aeb3a73713c3e7612e4c,Tests_passed,ff7f9983f0cde03c16d891e205197941f4fdbd8ea5d16c18e1019ea5312c3b36,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,Tests_passed,6d15f4452ed781b4dd575ba504e1c9f94c58efbb5f02ddab5bed23fa7b8941c1,0.03060436248779297,0.05168795585632324,0.0533297061920166,0.017643451690673828,0.012773513793945312,0.04325389862060547,0.012861490249633789,0.09770464897155762,0.06959891319274902,1.1076595783233643,0.4608135223388672,0.18973517417907715,0.17059588432312012,0.18232059478759766,0.1792616844177246,0.17852234840393066,0.06524658203125,0.19852542877197266,0.20274829864501953,0.19991230964660645,0.19913196563720703,0.18310761451721191,0.19746708869934082,0.1980602741241455,0.18977952003479004,1.186368703842163,0.49692344665527344,0.22449350357055664,0.2227165699005127,0.20423245429992676,0.1996469497680664,0.1985945701599121 diff --git a/results/combined/merges_timed/seam/render.csv b/results/combined/merges_timed/seam/render.csv index 839e46d5fa..b27aada3f6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,True,True,Tests_passed,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,True,12,83,675,11,True,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,True,19,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,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,4e4401c87f092847707a86e6ab63189a0c92328786ed3f8eb771ffd49fa5f68b,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,81fbe095b13d57534b530421062567bfdf85f0e58093ae075bbd1d275275172d,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,0.010184049606323242,0.010345220565795898,0.010647058486938477,0.016611814498901367,0.010709047317504883,0.010600090026855469,0.010545015335083008,0.059484004974365234,0.18144440650939941,0.9451065063476562,0.3651468753814697,0.05516624450683594,0.07708621025085449,0.06115269660949707,0.08310055732727051,0.07711386680603027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,True,True,Tests_passed,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,True,12,83,675,11,True,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,True,19,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,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,4e4401c87f092847707a86e6ab63189a0c92328786ed3f8eb771ffd49fa5f68b,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,81fbe095b13d57534b530421062567bfdf85f0e58093ae075bbd1d275275172d,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,0.010184049606323242,0.010345220565795898,0.010647058486938477,0.016611814498901367,0.010709047317504883,0.010600090026855469,0.010545015335083008,0.059484004974365234,0.18144440650939941,0.9451065063476562,0.3651468753814697,0.05516624450683594,0.07708621025085449,0.06115269660949707,0.08310055732727051,0.07711386680603027,0.07868075370788574,0.07436800003051758,0.07918739318847656,0.07442021369934082,0.08176207542419434,0.08191156387329102,0.07996797561645508,0.14399075508117676,0.17185568809509277,1.0508646965026855,0.4530634880065918,0.07981038093566895,0.08085966110229492,0.08153724670410156,0.08082222938537598,0.0754091739654541 diff --git a/results/combined/merges_timed/seanchenxi/gwt-storage.csv b/results/combined/merges_timed/seanchenxi/gwt-storage.csv index d990d96704..1bd455dc86 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,True,15,84,207,3,True,15,Tests_passed,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,True,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,True,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,6f98cf5dd872e0551a4dd71add1582352d899158525d900b9e415cac1a3394dd,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,ce9cce537f5689efe8a304038dd3ebd906eed2b728b0c1e80b8dda251f89d51c,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,5d4479236bbb0be43722bc05460865cd8816dddd251e01d96aa59b5fd8502570,Tests_failed,6359d692aca0304ebcdd571c3cb04b33e23aec483b8bf30af0ff53210a5704b5,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,0.04510641098022461,0.04225778579711914,0.039565086364746094,0.014908075332641602,0.043144941329956055,0.04473876953125,0.03986501693725586,0.19292354583740234,0.14043855667114258,1.0975100994110107,0.3826768398284912,0.04182791709899902,0.06238961219787598,0.04237079620361328,0.07338547706604004,0.07522702217102051 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,True,15,84,207,3,True,15,Tests_passed,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,True,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,True,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,6f98cf5dd872e0551a4dd71add1582352d899158525d900b9e415cac1a3394dd,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,ce9cce537f5689efe8a304038dd3ebd906eed2b728b0c1e80b8dda251f89d51c,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,5d4479236bbb0be43722bc05460865cd8816dddd251e01d96aa59b5fd8502570,Tests_failed,6359d692aca0304ebcdd571c3cb04b33e23aec483b8bf30af0ff53210a5704b5,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,Tests_passed,feb46c80598c3eaf85d94d39de9999b3b74e14a18fdbc64387283d4cc79cfc54,0.04510641098022461,0.04225778579711914,0.039565086364746094,0.014908075332641602,0.043144941329956055,0.04473876953125,0.03986501693725586,0.19292354583740234,0.14043855667114258,1.0975100994110107,0.3826768398284912,0.04182791709899902,0.06238961219787598,0.04237079620361328,0.07338547706604004,0.07522702217102051,0.07320380210876465,0.07025885581970215,0.0722048282623291,0.07096028327941895,0.07013797760009766,0.07349443435668945,0.07303309440612793,0.11630821228027344,0.13890719413757324,1.1489365100860596,0.43512916564941406,0.0716090202331543,0.07246732711791992,0.07251811027526855,0.0733025074005127,0.07211852073669434 diff --git a/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv b/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv index 6ed7107a35..a62eddc855 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,True,10,24,133,8,True,15,Tests_passed,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,True,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,1c259b0a7dc8dbab14adb804048c6fccbf1993bbb5fb6a0e418ae1d7f640a936,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Tests_failed,8a995edae439ca72cf2cdabfe33869b951f2a8823b9747d5217653d3fa45b2dc,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,d2772b8cd2833504fa16bb782f4fe9defc486c90554f891dffb308b4b2036566,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Tests_passed,ab6ce66193db95a6feda2978a68d10ac8cdec7432b5ad2428e12112065c4cc03,Tests_failed,a5f18dd820dc772de319ffc4b1bc964bf0d4bf4c8bbcc92a435ab06319d68130,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,0.02611565589904785,0.016202449798583984,0.018110275268554688,0.026961088180541992,0.018146991729736328,0.01820230484008789,0.01785588264465332,0.08224749565124512,0.12966394424438477,1.2912404537200928,0.7301967144012451,0.05750679969787598,0.07751750946044922,0.05608081817626953,0.07696294784545898,0.07781219482421875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,True,10,24,133,8,True,15,Tests_passed,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,True,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,1c259b0a7dc8dbab14adb804048c6fccbf1993bbb5fb6a0e418ae1d7f640a936,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Tests_failed,8a995edae439ca72cf2cdabfe33869b951f2a8823b9747d5217653d3fa45b2dc,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,d2772b8cd2833504fa16bb782f4fe9defc486c90554f891dffb308b4b2036566,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Tests_passed,ab6ce66193db95a6feda2978a68d10ac8cdec7432b5ad2428e12112065c4cc03,Tests_failed,a5f18dd820dc772de319ffc4b1bc964bf0d4bf4c8bbcc92a435ab06319d68130,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,0.02611565589904785,0.016202449798583984,0.018110275268554688,0.026961088180541992,0.018146991729736328,0.01820230484008789,0.01785588264465332,0.08224749565124512,0.12966394424438477,1.2912404537200928,0.7301967144012451,0.05750679969787598,0.07751750946044922,0.05608081817626953,0.07696294784545898,0.07781219482421875,0.07239460945129395,0.07214212417602539,0.07547736167907715,0.07452011108398438,0.07512021064758301,0.07652807235717773,0.07585406303405762,0.13104748725891113,0.16272878646850586,1.360548734664917,0.817021369934082,0.07505345344543457,0.0731201171875,0.07557559013366699,0.07298612594604492,0.07550358772277832 diff --git a/results/combined/merges_timed/seedboxer/seedboxer.csv b/results/combined/merges_timed/seedboxer/seedboxer.csv index 1079dad5c4..e8ce682e65 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,True,18,31,553,2,True,18,Tests_passed,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,True,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,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,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,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,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,3c5c727f3fb85431c333141a19ab99c6646d1feaaa20d17ed0275834291f4bab,Tests_passed,b4580d50e593b662cc03b1a3fc0c30fcccd616e2b5d9e9f32ef1c0ccd1bd146b,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,0.03856968879699707,0.04642915725708008,0.0518336296081543,0.025394916534423828,0.04487299919128418,0.040398359298706055,0.048494815826416016,0.16422486305236816,0.11340689659118652,0.4973893165588379,0.3979525566101074,0.046674251556396484,0.06863188743591309,0.04610419273376465,0.06920480728149414,0.07253527641296387 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,True,18,31,553,2,True,18,Tests_passed,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,True,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,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,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,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,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,3c5c727f3fb85431c333141a19ab99c6646d1feaaa20d17ed0275834291f4bab,Tests_passed,b4580d50e593b662cc03b1a3fc0c30fcccd616e2b5d9e9f32ef1c0ccd1bd146b,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,0.03856968879699707,0.04642915725708008,0.0518336296081543,0.025394916534423828,0.04487299919128418,0.040398359298706055,0.048494815826416016,0.16422486305236816,0.11340689659118652,0.4973893165588379,0.3979525566101074,0.046674251556396484,0.06863188743591309,0.04610419273376465,0.06920480728149414,0.07253527641296387,0.06474781036376953,0.0672910213470459,0.06673049926757812,0.0674433708190918,0.07119011878967285,0.06714034080505371,0.05453228950500488,0.10416364669799805,0.1008291244506836,0.547335147857666,0.4221508502960205,0.06519293785095215,0.06638050079345703,0.06601262092590332,0.0654764175415039,0.06118202209472656 diff --git a/results/combined/merges_timed/segmentio/analytics-java.csv b/results/combined/merges_timed/segmentio/analytics-java.csv index 6558617625..6205694c6b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,111,1451,3,True,24,Tests_passed,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,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,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,Merge_failed,60d3928c10e657131dd19bf0c2890ce32e1e590c9a7c3f82a1f863ec82737ad4,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,9cb7ad0571d52651ef51b3702bdcbe1914e51d098dbac8f71d8dcff0f4304bb5,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,7d64ea3b726247bf24052b9fc438ef6028be17632da2cf57ef9efda6265ce466,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,96592d580e3c392b6a518fcfc945c9694409da3f63a4d1637dc1fcfc7f22451b,Tests_failed,a8f4d6b1656953ebc221763e55684f7fa09d1736be78aaf5466d249d9daafe75,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,0.04375863075256348,0.0443568229675293,0.03990340232849121,0.0186004638671875,0.050798654556274414,0.04447317123413086,0.049394845962524414,0.15560483932495117,0.17710614204406738,1.9982876777648926,0.5738058090209961,0.06026935577392578,0.060083627700805664,0.07110881805419922,0.11680865287780762,0.06966328620910645 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,111,1451,3,True,24,Tests_passed,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,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,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,Merge_failed,60d3928c10e657131dd19bf0c2890ce32e1e590c9a7c3f82a1f863ec82737ad4,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,9cb7ad0571d52651ef51b3702bdcbe1914e51d098dbac8f71d8dcff0f4304bb5,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,7d64ea3b726247bf24052b9fc438ef6028be17632da2cf57ef9efda6265ce466,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,96592d580e3c392b6a518fcfc945c9694409da3f63a4d1637dc1fcfc7f22451b,Tests_failed,a8f4d6b1656953ebc221763e55684f7fa09d1736be78aaf5466d249d9daafe75,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,8b75128e7f77a54cbc0e2d697f5dea3d0edadf680ff775ebbb122ae6fd091d9b,Merge_failed,cfdd9532dd91007e7bb4a4833af6a102c30321a90a9fb529165904600a222ff1,0.04375863075256348,0.0443568229675293,0.03990340232849121,0.0186004638671875,0.050798654556274414,0.04447317123413086,0.049394845962524414,0.15560483932495117,0.17710614204406738,1.9982876777648926,0.5738058090209961,0.06026935577392578,0.060083627700805664,0.07110881805419922,0.11680865287780762,0.06966328620910645,0.11268305778503418,0.06662464141845703,0.11234712600708008,0.06862044334411621,0.27263736724853516,0.26980161666870117,0.267902135848999,0.316835880279541,0.3394343852996826,2.0184314250946045,0.6430709362030029,0.11382460594177246,0.11060714721679688,0.11267542839050293,0.11128902435302734,0.067169189453125 diff --git a/results/combined/merges_timed/semanticvectors/semanticvectors.csv b/results/combined/merges_timed/semanticvectors/semanticvectors.csv index 74512c3aed..03655c6ec7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,True,True,Tests_passed,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,True,2,76,415,2,True,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,True,2,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,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,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,3bb5ccfff1e01f9d153b5f05181f8f010dc9d6bc40ba4d9d5382febf59675fdd,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,0.025330305099487305,0.025463581085205078,0.03290414810180664,0.045067787170410156,0.03354215621948242,0.03334546089172363,0.0333404541015625,0.06694221496582031,0.08181262016296387,1.3818466663360596,0.711993932723999,0.0733041763305664,0.09999227523803711,0.07126593589782715,0.062108755111694336,0.10230875015258789 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,True,True,Tests_passed,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,True,2,76,415,2,True,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,True,2,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,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,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,3bb5ccfff1e01f9d153b5f05181f8f010dc9d6bc40ba4d9d5382febf59675fdd,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,0.025330305099487305,0.025463581085205078,0.03290414810180664,0.045067787170410156,0.03354215621948242,0.03334546089172363,0.0333404541015625,0.06694221496582031,0.08181262016296387,1.3818466663360596,0.711993932723999,0.0733041763305664,0.09999227523803711,0.07126593589782715,0.062108755111694336,0.10230875015258789,0.0942075252532959,0.08795356750488281,0.11205530166625977,0.1037142276763916,0.10393881797790527,0.11281347274780273,0.09078598022460938,0.15307164192199707,0.12896466255187988,1.5229904651641846,0.7590243816375732,0.10373926162719727,0.0951390266418457,0.10572242736816406,0.09909701347351074,0.059589385986328125 diff --git a/results/combined/merges_timed/sexyideas/moosificator.csv b/results/combined/merges_timed/sexyideas/moosificator.csv index 25bb37dbde..0f880830bc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,True,3,21,181,2,True,3,Tests_passed,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,True,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,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,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,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,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,8120588f098bbebd44d2d52d7feb0d166f8887d9b383b6545069ae0ffac1da24,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,0.024816274642944336,0.02511000633239746,0.033158063888549805,0.044767141342163086,0.033238887786865234,0.03332853317260742,0.033098459243774414,0.06605696678161621,0.0801999568939209,0.8998317718505859,0.5147256851196289,0.07146930694580078,0.09748530387878418,0.07178401947021484,0.0960390567779541,0.09377002716064453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,True,3,21,181,2,True,3,Tests_passed,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,True,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,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,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,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,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,8120588f098bbebd44d2d52d7feb0d166f8887d9b383b6545069ae0ffac1da24,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,0.024816274642944336,0.02511000633239746,0.033158063888549805,0.044767141342163086,0.033238887786865234,0.03332853317260742,0.033098459243774414,0.06605696678161621,0.0801999568939209,0.8998317718505859,0.5147256851196289,0.07146930694580078,0.09748530387878418,0.07178401947021484,0.0960390567779541,0.09377002716064453,0.08939599990844727,0.08589506149291992,0.10762453079223633,0.09879517555236816,0.1040956974029541,0.10248494148254395,0.1034996509552002,0.14678120613098145,0.13756299018859863,1.0491423606872559,0.572627067565918,0.09544658660888672,0.09397029876708984,0.0962212085723877,0.09547853469848633,0.0908823013305664 diff --git a/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv b/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv index 063716e88c..b8364a918a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,True,21,131,558,7,True,21,Tests_passed,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,True,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,2fc449e6f33f6d1e4899541d6090246ebd4146c6bfba73d4951b445975b10cdf,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Tests_failed,0ca14efc38b9542fec6950f38cd79741ae650f3196b5f0428043f4b11d68427a,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,5823bf5fc2a1693819f7590a3a76a9c6987f4bfa2a418c27499791ff1b0a9ec4,Merge_failed,42dc4668b571c53ae66c1c4edb249b00e7bc60e24382ada5cda73868ab2222b5,Merge_failed,42dc4668b571c53ae66c1c4edb249b00e7bc60e24382ada5cda73868ab2222b5,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,3a03f1168f1ae44630d61e7a3c0553a8639e1fbf0a971676a43c0ef3611103d5,Merge_failed,28087e12d9a697b4e122d1a65594b119abc07d52837ee5fd95d09b1524bebe4a,Tests_passed,cc11a6c1754e87d826c6364ca1a74c72f10614de2241583691fa77a0f84ad5cf,Tests_failed,ce8205f29b84697cfc97f6f755fbbb703a14bb8df269abd49dc09f21d8eaadd0,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,0.04803776741027832,0.0465397834777832,0.047884464263916016,0.024167537689208984,0.03565835952758789,0.06402182579040527,0.041419267654418945,0.479264497756958,0.39775705337524414,3.594984292984009,0.4280509948730469,0.06706929206848145,0.15101075172424316,0.07084918022155762,0.15181922912597656,0.1533510684967041 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,True,21,131,558,7,True,21,Tests_passed,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,True,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,2fc449e6f33f6d1e4899541d6090246ebd4146c6bfba73d4951b445975b10cdf,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Tests_failed,0ca14efc38b9542fec6950f38cd79741ae650f3196b5f0428043f4b11d68427a,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,5823bf5fc2a1693819f7590a3a76a9c6987f4bfa2a418c27499791ff1b0a9ec4,Merge_failed,42dc4668b571c53ae66c1c4edb249b00e7bc60e24382ada5cda73868ab2222b5,Merge_failed,42dc4668b571c53ae66c1c4edb249b00e7bc60e24382ada5cda73868ab2222b5,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,3a03f1168f1ae44630d61e7a3c0553a8639e1fbf0a971676a43c0ef3611103d5,Merge_failed,28087e12d9a697b4e122d1a65594b119abc07d52837ee5fd95d09b1524bebe4a,Tests_passed,cc11a6c1754e87d826c6364ca1a74c72f10614de2241583691fa77a0f84ad5cf,Tests_failed,ce8205f29b84697cfc97f6f755fbbb703a14bb8df269abd49dc09f21d8eaadd0,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,Merge_failed,a85c9fc69eca719fac0466d79b0e7c9d5727d122e3721d8c8033e29e3997006e,0.04803776741027832,0.0465397834777832,0.047884464263916016,0.024167537689208984,0.03565835952758789,0.06402182579040527,0.041419267654418945,0.479264497756958,0.39775705337524414,3.594984292984009,0.4280509948730469,0.06706929206848145,0.15101075172424316,0.07084918022155762,0.15181922912597656,0.1533510684967041,0.1472153663635254,0.14543628692626953,0.14617657661437988,0.14367175102233887,0.1444547176361084,0.1470484733581543,0.14266443252563477,0.2712864875793457,0.3136136531829834,3.6586294174194336,0.6073482036590576,0.14542841911315918,0.1437971591949463,0.14194107055664062,0.149566650390625,0.14739513397216797 diff --git a/results/combined/merges_timed/shazam/shazamcrest.csv b/results/combined/merges_timed/shazam/shazamcrest.csv index 7ca9f29082..a8232d5437 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,True,True,Tests_passed,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,True,3,7,42,10,True,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,True,11,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_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,2420820b78a677932a8a5b015f38e483f2f49bb1877f2ce7474adbb4ce55ccd1,Tests_passed,37540d4fd0d997a7b9a012c4ce7b2b8b34f1f45bc9d5aab26a768403be15b631,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,0.04093050956726074,0.04181098937988281,0.04340720176696777,0.01677250862121582,0.047173261642456055,0.05077362060546875,0.04831814765930176,0.17142391204833984,0.11551952362060547,0.8054537773132324,0.49353456497192383,0.03329157829284668,0.0585479736328125,0.030385494232177734,0.05819249153137207,0.05729246139526367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,True,True,Tests_passed,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,True,3,7,42,10,True,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,True,11,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_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,2420820b78a677932a8a5b015f38e483f2f49bb1877f2ce7474adbb4ce55ccd1,Tests_passed,37540d4fd0d997a7b9a012c4ce7b2b8b34f1f45bc9d5aab26a768403be15b631,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,Tests_passed,e2a15826f927991f5967b06bc20b7272ba36152892927741b3cbcbe80fd1c795,0.04093050956726074,0.04181098937988281,0.04340720176696777,0.01677250862121582,0.047173261642456055,0.05077362060546875,0.04831814765930176,0.17142391204833984,0.11551952362060547,0.8054537773132324,0.49353456497192383,0.03329157829284668,0.0585479736328125,0.030385494232177734,0.05819249153137207,0.05729246139526367,0.05806922912597656,0.058051109313964844,0.05803966522216797,0.05719113349914551,0.058771610260009766,0.05831193923950195,0.05617547035217285,0.08999323844909668,0.08645844459533691,0.8248028755187988,0.5294301509857178,0.05623936653137207,0.056485891342163086,0.05794787406921387,0.058365583419799805,0.05784726142883301 diff --git a/results/combined/merges_timed/shhs-coding-club/drugwars.csv b/results/combined/merges_timed/shhs-coding-club/drugwars.csv index 170daac1bf..5ea4080960 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,True,7,17,54,4,True,7,Tests_passed,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,True,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,True,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,de071cfa8128d6c528f9bcc11742a8d2d4c6296e8758bb64ff03e1e0c3f19d02,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,0e19a84aa321234e39723de2143865ccf55261ce88ae6df211a028b86113dbdc,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,4dbf1e8f2290cca3fe8a16ebadd4cfaffe7654d712f58fd2c5bbe741a5d720d4,Merge_timedout,,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,0.034474849700927734,0.0351715087890625,0.036629676818847656,0.012647151947021484,0.03618907928466797,0.03722262382507324,0.0374755859375,0.2816050052642822,0.2166118621826172,1.4728028774261475,0.38126254081726074,0.03961515426635742,0.07620859146118164,0.03820443153381348,0.07589507102966309,0.07403206825256348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,True,7,17,54,4,True,7,Tests_passed,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,True,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,True,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,de071cfa8128d6c528f9bcc11742a8d2d4c6296e8758bb64ff03e1e0c3f19d02,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,0e19a84aa321234e39723de2143865ccf55261ce88ae6df211a028b86113dbdc,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,4dbf1e8f2290cca3fe8a16ebadd4cfaffe7654d712f58fd2c5bbe741a5d720d4,Merge_timedout,,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,0.034474849700927734,0.0351715087890625,0.036629676818847656,0.012647151947021484,0.03618907928466797,0.03722262382507324,0.0374755859375,0.2816050052642822,0.2166118621826172,1.4728028774261475,0.38126254081726074,0.03961515426635742,0.07620859146118164,0.03820443153381348,0.07589507102966309,0.07403206825256348,0.07471942901611328,0.07545709609985352,0.07410979270935059,0.07631492614746094,0.07480025291442871,0.07609915733337402,0.07464003562927246,0.13889360427856445,0.16080594062805176,1.6629321575164795,0.49625158309936523,0.07650303840637207,0.07479500770568848,0.07487058639526367,0.07516908645629883,0.0765833854675293 diff --git a/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv b/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv index 70f2d93d4d..b5084d35e7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,True,28,78,787,3,True,28,Tests_passed,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,True,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,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,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,14691298c8c5f8af280dea32626aa04f3d6db0cd84aeca4bc8b5872e09e64f81,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,acb493ce7d51b1bf43daff85a65b6df06d6e28ab9380305d1ca3a3e8a2a955bf,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,0.03922295570373535,0.038866281509399414,0.03798699378967285,0.013406753540039062,0.016871929168701172,0.03718304634094238,0.04098176956176758,0.21569323539733887,0.16754460334777832,0.6607444286346436,0.40941548347473145,0.03858542442321777,0.05896568298339844,0.03766226768493652,0.060930728912353516,0.0608212947845459 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,True,28,78,787,3,True,28,Tests_passed,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,True,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,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,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,14691298c8c5f8af280dea32626aa04f3d6db0cd84aeca4bc8b5872e09e64f81,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,acb493ce7d51b1bf43daff85a65b6df06d6e28ab9380305d1ca3a3e8a2a955bf,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,0.03922295570373535,0.038866281509399414,0.03798699378967285,0.013406753540039062,0.016871929168701172,0.03718304634094238,0.04098176956176758,0.21569323539733887,0.16754460334777832,0.6607444286346436,0.40941548347473145,0.03858542442321777,0.05896568298339844,0.03766226768493652,0.060930728912353516,0.0608212947845459,0.0630502700805664,0.06405401229858398,0.06246066093444824,0.06253600120544434,0.06227827072143555,0.0643460750579834,0.06349563598632812,0.11219096183776855,0.12975549697875977,0.8451900482177734,0.5256080627441406,0.06212949752807617,0.060827016830444336,0.06291413307189941,0.06176638603210449,0.06193137168884277 diff --git a/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv b/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv index 0f77d3cb07..ce20660529 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,True,13,25,189.0,2,True,13,Tests_passed,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,True,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,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,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_timedout,,Tests_passed,0197b6b0308c3df2217e33925fc4623f590064aa3347af4d4e04416923b3d250,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,326ed4456738ef75d0afeebcd2eacf11d3157621e1391c86519879cbe4420849,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,eb676d9c1c7afca91494b49765f6b2fa5bd048c905492aaedfd8bda21101f8aa,Merge_timedout,,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.02412271499633789,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.12846994400024414,1.1160502433776855,-1.0,0.06960034370422363,0.054418325424194336,0.05209541320800781,0.05413317680358887,0.05373716354370117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,True,13,25,189.0,2,True,13,Tests_passed,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,True,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,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,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_timedout,,Tests_passed,0197b6b0308c3df2217e33925fc4623f590064aa3347af4d4e04416923b3d250,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,326ed4456738ef75d0afeebcd2eacf11d3157621e1391c86519879cbe4420849,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,eb676d9c1c7afca91494b49765f6b2fa5bd048c905492aaedfd8bda21101f8aa,Merge_timedout,,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.02412271499633789,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.12846994400024414,1.1160502433776855,-1.0,0.06960034370422363,0.054418325424194336,0.05209541320800781,0.05413317680358887,0.05373716354370117,0.05193495750427246,0.050650596618652344,0.051505088806152344,0.0518190860748291,0.05210566520690918,0.052474260330200195,0.050438880920410156,0.08973574638366699,0.08736467361450195,1.1175694465637207,-1.0,0.054862022399902344,0.05113410949707031,0.05080080032348633,0.04938030242919922,0.051641225814819336 diff --git a/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv b/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv index e7b4c0cd6d..e111cedb8a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,True,28,65,1145,5,True,28,Tests_passed,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,True,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,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,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,c7961e7c61f167b419d890382e199c2b45689c84310b4ce4e3e73568afbb4470,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,e088c254a7dd5d8bf4c3f422fe05714b12d9958309504c71198be3a2aac20b18,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,0.06412935256958008,0.0642547607421875,0.07767677307128906,0.05843925476074219,0.07806968688964844,0.011252880096435547,0.0782012939453125,0.14611363410949707,0.28690481185913086,1.8885271549224854,0.5534060001373291,0.0768582820892334,0.14554572105407715,0.15650177001953125,0.09247040748596191,0.22222542762756348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,True,28,65,1145,5,True,28,Tests_passed,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,True,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,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,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,c7961e7c61f167b419d890382e199c2b45689c84310b4ce4e3e73568afbb4470,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,e088c254a7dd5d8bf4c3f422fe05714b12d9958309504c71198be3a2aac20b18,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,2b6ba1d9b0b85dc75a5dae21f9b77745209fd94a63c2499b064990551437e3eb,0.06412935256958008,0.0642547607421875,0.07767677307128906,0.05843925476074219,0.07806968688964844,0.011252880096435547,0.0782012939453125,0.14611363410949707,0.28690481185913086,1.8885271549224854,0.5534060001373291,0.0768582820892334,0.14554572105407715,0.15650177001953125,0.09247040748596191,0.22222542762756348,0.09016895294189453,0.17363309860229492,0.18962931632995605,0.12485742568969727,0.08832216262817383,0.1901841163635254,0.17679071426391602,0.24672460556030273,0.2924022674560547,2.158623695373535,0.6489162445068359,0.14055800437927246,0.17165780067443848,0.15672636032104492,0.11112308502197266,0.21559715270996094 diff --git a/results/combined/merges_timed/silverpop/engage-api-client.csv b/results/combined/merges_timed/silverpop/engage-api-client.csv index c87c898c27..9af1c1d971 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,True,42,113,1102,2,True,42,Tests_passed,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,True,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,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_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,685d05da82b1827432cde32c0ebd58b65a237b34b82b411c65b163ad2369575c,Tests_failed,c190c1a0999ed860837a542a9cedf96e102c49607ddccf2f59067d52bd5ca402,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,0.039132118225097656,0.04591512680053711,0.048517465591430664,0.018950223922729492,0.0525362491607666,0.045278310775756836,0.04542803764343262,0.1691431999206543,0.10554885864257812,0.5767779350280762,0.5813744068145752,0.04978632926940918,0.07090544700622559,0.03594088554382324,0.06130576133728027,0.0648336410522461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,True,42,113,1102,2,True,42,Tests_passed,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,True,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,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_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,685d05da82b1827432cde32c0ebd58b65a237b34b82b411c65b163ad2369575c,Tests_failed,c190c1a0999ed860837a542a9cedf96e102c49607ddccf2f59067d52bd5ca402,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,Tests_passed,ad28d5c92bb816b4ba0dccc15cf2f3b1c49d3cdbd17fbe37fa3bf150d445aca1,0.039132118225097656,0.04591512680053711,0.048517465591430664,0.018950223922729492,0.0525362491607666,0.045278310775756836,0.04542803764343262,0.1691431999206543,0.10554885864257812,0.5767779350280762,0.5813744068145752,0.04978632926940918,0.07090544700622559,0.03594088554382324,0.06130576133728027,0.0648336410522461,0.0705876350402832,0.07172513008117676,0.07592225074768066,0.07454133033752441,0.06339430809020996,0.06712698936462402,0.07195091247558594,0.11038947105407715,0.10452461242675781,0.6792037487030029,0.6768405437469482,0.06612610816955566,0.06173348426818848,0.07210111618041992,0.06970429420471191,0.07289695739746094 diff --git a/results/combined/merges_timed/simasch/qlrm.csv b/results/combined/merges_timed/simasch/qlrm.csv index fa3fd4d500..e9962916ef 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,True,11,79,866,3,True,11,Tests_passed,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,True,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,True,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,d730020cb1f6084ef5dd870f73e66230ddb0aeef7ca27a97afda387c0aa75796,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Tests_failed,62606285ea34c262c9739ff9674da19e8ef5e22fa988a487cfd4e1084cc5fdb9,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,452ec8fea90027426fbae865535014815da40c51a5d1008cf9fd370df72acc00,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,8a77897f1056bd722f24c85a0f74051d87a91a000967cbfd3190b59628f6c980,Merge_failed,78e90a0d4893bc36bee7feb0add38e955cfe04a791abae920c2baa89ee9b7868,Merge_failed,6ecd5a2e905216fefbbb2c3e2bccef79d9979972b95bc76641f48a29228da4d9,Tests_failed,4001435be063b743e676785e8b70e3413b5f7319850e0227590ac35768036f58,Tests_failed,9d8ae670ffc8c179719c60a6f27ef869e0168c89bc35c99c589e0e3643e72475,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,0.007882118225097656,0.008205175399780273,0.008131265640258789,0.013622045516967773,0.008134603500366211,0.008313417434692383,0.008220911026000977,0.042388200759887695,0.12354135513305664,1.082301139831543,0.44722700119018555,0.05044746398925781,0.052994728088378906,0.05105113983154297,0.05580854415893555,0.06001591682434082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,True,11,79,866,3,True,11,Tests_passed,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,True,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,True,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,d730020cb1f6084ef5dd870f73e66230ddb0aeef7ca27a97afda387c0aa75796,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Tests_failed,62606285ea34c262c9739ff9674da19e8ef5e22fa988a487cfd4e1084cc5fdb9,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,452ec8fea90027426fbae865535014815da40c51a5d1008cf9fd370df72acc00,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,8a77897f1056bd722f24c85a0f74051d87a91a000967cbfd3190b59628f6c980,Merge_failed,78e90a0d4893bc36bee7feb0add38e955cfe04a791abae920c2baa89ee9b7868,Merge_failed,6ecd5a2e905216fefbbb2c3e2bccef79d9979972b95bc76641f48a29228da4d9,Tests_failed,4001435be063b743e676785e8b70e3413b5f7319850e0227590ac35768036f58,Tests_failed,9d8ae670ffc8c179719c60a6f27ef869e0168c89bc35c99c589e0e3643e72475,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,f8866ce6356e0b8dba3a363bd6535ddb747607fde3673b89fb12163d91dbc7d6,Merge_failed,52e7f18249e2fae1ed01b60671dc1875205154144681777b2327bc85b791abc8,0.007882118225097656,0.008205175399780273,0.008131265640258789,0.013622045516967773,0.008134603500366211,0.008313417434692383,0.008220911026000977,0.042388200759887695,0.12354135513305664,1.082301139831543,0.44722700119018555,0.05044746398925781,0.052994728088378906,0.05105113983154297,0.05580854415893555,0.06001591682434082,0.05387163162231445,0.05833315849304199,0.05389571189880371,0.05678892135620117,0.05365729331970215,0.05268669128417969,0.05408024787902832,0.09820747375488281,0.12418007850646973,1.170163631439209,0.4956367015838623,0.0538482666015625,0.05445289611816406,0.05370378494262695,0.05402541160583496,0.0578460693359375 diff --git a/results/combined/merges_timed/simmetrics/simmetrics.csv b/results/combined/merges_timed/simmetrics/simmetrics.csv index 028f5dcf93..5e489ed04a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -59,refs/heads/master,a0857905c0446c61e7f264aea4138a5cc0d2a2b5,4e647c4e54524f977a71d09a34624261f225d81b,ab3332f7038654d70023b9438597bc305e844503,,True,True,True,33,79,584,2,True,33,Tests_passed,52f04d3da6331129cfe81c89e6b5f505ee54d281434e694429df3a6d285801ca,True,Tests_passed,283191769b1da266ac42cad72db5b4760cea4caa3fe393d614b2e2f1726b595d,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,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,b5ca95125ff6a2507edc37b4b7b435689ae46df3487785eae5ceb5dbd83edb41,Merge_failed,c5a45a266e25e4547cd3fd8513a8dd0a1493d52e03068ef2ae91d80ffa53cedb,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,944064eccbcb2c498549a02df691fcad569ee6e63820869cc6e47c64b6f2b433,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_failed,3998c4b9bff954777e97dc5dcf9b2f6dfea5dfa49fa7c7e2370df081f73e39d0,Tests_failed,fe12111cfe1581c0d3942a48e7e06737300a85375740bca689d94726df0c04e4,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,0.056630849838256836,0.022049427032470703,0.021914005279541016,0.037235260009765625,0.011544466018676758,0.035361289978027344,0.039339303970336914,0.12678837776184082,0.11190938949584961,0.7704253196716309,0.567192792892456,0.06964588165283203,0.06424164772033691,0.05143141746520996,0.06625819206237793,0.04710960388183594 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +59,refs/heads/master,a0857905c0446c61e7f264aea4138a5cc0d2a2b5,4e647c4e54524f977a71d09a34624261f225d81b,ab3332f7038654d70023b9438597bc305e844503,,True,True,True,33,79,584,2,True,33,Tests_passed,52f04d3da6331129cfe81c89e6b5f505ee54d281434e694429df3a6d285801ca,True,Tests_passed,283191769b1da266ac42cad72db5b4760cea4caa3fe393d614b2e2f1726b595d,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,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,b5ca95125ff6a2507edc37b4b7b435689ae46df3487785eae5ceb5dbd83edb41,Merge_failed,c5a45a266e25e4547cd3fd8513a8dd0a1493d52e03068ef2ae91d80ffa53cedb,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,944064eccbcb2c498549a02df691fcad569ee6e63820869cc6e47c64b6f2b433,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_failed,3998c4b9bff954777e97dc5dcf9b2f6dfea5dfa49fa7c7e2370df081f73e39d0,Tests_failed,fe12111cfe1581c0d3942a48e7e06737300a85375740bca689d94726df0c04e4,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,0.056630849838256836,0.022049427032470703,0.021914005279541016,0.037235260009765625,0.011544466018676758,0.035361289978027344,0.039339303970336914,0.12678837776184082,0.11190938949584961,0.7704253196716309,0.567192792892456,0.06964588165283203,0.06424164772033691,0.05143141746520996,0.06625819206237793,0.04710960388183594,0.04506826400756836,0.06130409240722656,0.043920278549194336,0.06888675689697266,0.05877518653869629,0.06461191177368164,0.06674647331237793,0.10336709022521973,0.0851895809173584,0.8048086166381836,0.6362907886505127,0.06644487380981445,0.04525923728942871,0.06389594078063965,0.054323673248291016,0.06550383567810059 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 fc5f889f11..140a3a50a8 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,True,True,Tests_passed,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,True,15,40,690,2,True,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,True,15,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_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,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_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,ada28c4bfc87f0c03e7dc34f779ac11ae7ebc8a6046bd8abab9b6d768e894568,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,0.04755997657775879,0.042946577072143555,0.016492128372192383,0.021976709365844727,0.04719209671020508,0.047753095626831055,0.03908276557922363,0.14884352684020996,0.10892319679260254,1.5399529933929443,0.3455159664154053,0.045066118240356445,0.07567906379699707,0.044382333755493164,0.0732572078704834,0.07397055625915527 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,True,True,Tests_passed,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,True,15,40,690,2,True,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,True,15,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_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,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_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,ada28c4bfc87f0c03e7dc34f779ac11ae7ebc8a6046bd8abab9b6d768e894568,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,0.04755997657775879,0.042946577072143555,0.016492128372192383,0.021976709365844727,0.04719209671020508,0.047753095626831055,0.03908276557922363,0.14884352684020996,0.10892319679260254,1.5399529933929443,0.3455159664154053,0.045066118240356445,0.07567906379699707,0.044382333755493164,0.0732572078704834,0.07397055625915527,0.07177734375,0.07576942443847656,0.07643795013427734,0.07803964614868164,0.06583428382873535,0.07787442207336426,0.0747377872467041,0.11772775650024414,0.11258602142333984,1.7274627685546875,0.4448833465576172,0.07796669006347656,0.07326173782348633,0.07351422309875488,0.07184314727783203,0.07250285148620605 diff --git a/results/combined/merges_timed/skyscreamer/jsonassert.csv b/results/combined/merges_timed/skyscreamer/jsonassert.csv index d6edc8e42d..e0817262d1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,True,True,True,4,16,45,2,True,4,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,True,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,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,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,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,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,3f26ce55db07b87f338e0a22ac45b5f1e652a238f8a858f2409a1b4583b14d8e,Tests_failed,1263cbebed78eabc74b416daafe60e17cb7c8a6f0e08a4b9a0b706ccbe7848e6,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,0.039108991622924805,0.040750741958618164,0.047838687896728516,0.017003297805786133,0.040300846099853516,0.035968780517578125,0.04454779624938965,0.15165996551513672,0.10843181610107422,0.8140027523040771,0.32557153701782227,0.03177666664123535,0.05803203582763672,0.0327455997467041,0.05615592002868652,0.05669426918029785 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,True,True,True,4,16,45,2,True,4,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,True,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,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,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,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,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,3f26ce55db07b87f338e0a22ac45b5f1e652a238f8a858f2409a1b4583b14d8e,Tests_failed,1263cbebed78eabc74b416daafe60e17cb7c8a6f0e08a4b9a0b706ccbe7848e6,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,0.039108991622924805,0.040750741958618164,0.047838687896728516,0.017003297805786133,0.040300846099853516,0.035968780517578125,0.04454779624938965,0.15165996551513672,0.10843181610107422,0.8140027523040771,0.32557153701782227,0.03177666664123535,0.05803203582763672,0.0327455997467041,0.05615592002868652,0.05669426918029785,0.05355024337768555,0.05481457710266113,0.056708574295043945,0.05586695671081543,0.056020498275756836,0.055262088775634766,0.05545401573181152,0.08646202087402344,0.08698439598083496,0.831395149230957,0.3662536144256592,0.05526161193847656,0.05601644515991211,0.05432868003845215,0.05484127998352051,0.05458974838256836 diff --git a/results/combined/merges_timed/skyscreamer/nevado.csv b/results/combined/merges_timed/skyscreamer/nevado.csv index 97e2e0fecf..dde8d19bd7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,Tests_passed,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,True,11,26,141,3,True,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,True,11,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Tests_failed,e551ab3a517c7aa55f7e1c8a395469d9824325b52d3523447d18e3c11abac1a1,Merge_failed,4aa3c76f256e73a90959ac253efb97b955126dd9e2bb9abdc0617cc1020fc948,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,79a10f55f5ec6f15722f43cdc0e77233093f3ca34bd1b215309f65777b67e4c1,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,48e08a953a7238d141fd349244738973877395bc912ac205108441c1b93d73d8,Tests_failed,27cca65fd23e80c1218fb679699160f86ffc9b99b282401d41a506a3c4dea4a6,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,0.0459904670715332,0.04252791404724121,0.044263601303100586,0.0218963623046875,0.03361225128173828,0.02917957305908203,0.04478740692138672,0.22947001457214355,0.18228793144226074,1.2623364925384521,0.356126070022583,0.04245400428771973,0.07296204566955566,0.05092167854309082,0.06456971168518066,0.0709996223449707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,Tests_passed,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,True,11,26,141,3,True,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,True,11,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Tests_failed,e551ab3a517c7aa55f7e1c8a395469d9824325b52d3523447d18e3c11abac1a1,Merge_failed,4aa3c76f256e73a90959ac253efb97b955126dd9e2bb9abdc0617cc1020fc948,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,79a10f55f5ec6f15722f43cdc0e77233093f3ca34bd1b215309f65777b67e4c1,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,48e08a953a7238d141fd349244738973877395bc912ac205108441c1b93d73d8,Tests_failed,27cca65fd23e80c1218fb679699160f86ffc9b99b282401d41a506a3c4dea4a6,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,0.0459904670715332,0.04252791404724121,0.044263601303100586,0.0218963623046875,0.03361225128173828,0.02917957305908203,0.04478740692138672,0.22947001457214355,0.18228793144226074,1.2623364925384521,0.356126070022583,0.04245400428771973,0.07296204566955566,0.05092167854309082,0.06456971168518066,0.0709996223449707,0.06714057922363281,0.07059574127197266,0.06979942321777344,0.07120704650878906,0.06900978088378906,0.06880974769592285,0.06939268112182617,0.10864615440368652,0.13222908973693848,1.3426034450531006,0.40697598457336426,0.06792426109313965,0.06108975410461426,0.07035684585571289,0.07034730911254883,0.06269645690917969 diff --git a/results/combined/merges_timed/skyscreamer/yoga.csv b/results/combined/merges_timed/skyscreamer/yoga.csv index 30639f8d89..0e69e7151c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,71,311,1977,8,True,71,Tests_passed,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,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,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,Tests_passed,45a75741515c2bcf51037b870183cc4506f8ad28e34e41fc7fe9d79725b43db9,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,8e569976a10c1a799f5adfbe2b53411d511b4ae26169fef9cf0d3f52862976d6,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,4a15fb02a6063ac1a37108caf4654b73d90cd3b8bd9d0b8498c3e7495ba37b05,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,0.05683565139770508,0.042063236236572266,0.05932426452636719,0.020914077758789062,0.054372549057006836,0.06060647964477539,0.04792499542236328,0.5594606399536133,0.44727540016174316,0.544395923614502,0.8343822956085205,0.0888833999633789,0.1579439640045166,0.06231284141540527,0.16297149658203125,0.1723175048828125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,71,311,1977,8,True,71,Tests_passed,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,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,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,Tests_passed,45a75741515c2bcf51037b870183cc4506f8ad28e34e41fc7fe9d79725b43db9,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,8e569976a10c1a799f5adfbe2b53411d511b4ae26169fef9cf0d3f52862976d6,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,4a15fb02a6063ac1a37108caf4654b73d90cd3b8bd9d0b8498c3e7495ba37b05,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,cdeb067059ea1f12bbba3b716fb3ad1cb9f723cf542efbbf22b10e9f91da1045,0.05683565139770508,0.042063236236572266,0.05932426452636719,0.020914077758789062,0.054372549057006836,0.06060647964477539,0.04792499542236328,0.5594606399536133,0.44727540016174316,0.544395923614502,0.8343822956085205,0.0888833999633789,0.1579439640045166,0.06231284141540527,0.16297149658203125,0.1723175048828125,0.14935660362243652,0.15449070930480957,0.1535968780517578,0.15747642517089844,0.1515827178955078,0.15026259422302246,0.1508622169494629,0.28872060775756836,0.32775354385375977,0.6727850437164307,0.9917852878570557,0.15293407440185547,0.14912676811218262,0.15259909629821777,0.15433239936828613,0.16069650650024414 diff --git a/results/combined/merges_timed/smartrics/restfixture.csv b/results/combined/merges_timed/smartrics/restfixture.csv index a8e34ffe29..948b1df758 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,True,True,True,7,16,116.0,4,True,7,Tests_passed,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,True,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,311b66c4af3b13ce0a5bbd2bdd8b50814c44f2b448456f89b0ed857440d1a803,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,34f6efe6d2deec5103cd69028a5d52198eab571d5b51719b65e1eaf917fc5684,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,8e1aceea899aeaac79e65e72719cf1f56923bb14de9e432eac33517c7886ac4c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,0.04712033271789551,0.032410621643066406,0.04405069351196289,0.021999835968017578,0.04775547981262207,0.05484461784362793,0.04756975173950195,0.33116579055786133,0.23745512962341309,3.310755968093872,0.5079143047332764,0.07560229301452637,0.0734708309173584,0.07350492477416992,0.07395386695861816,0.08442139625549316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,True,True,True,7,16,116.0,4,True,7,Tests_passed,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,True,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,311b66c4af3b13ce0a5bbd2bdd8b50814c44f2b448456f89b0ed857440d1a803,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,34f6efe6d2deec5103cd69028a5d52198eab571d5b51719b65e1eaf917fc5684,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,8e1aceea899aeaac79e65e72719cf1f56923bb14de9e432eac33517c7886ac4c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,0.04712033271789551,0.032410621643066406,0.04405069351196289,0.021999835968017578,0.04775547981262207,0.05484461784362793,0.04756975173950195,0.33116579055786133,0.23745512962341309,3.310755968093872,0.5079143047332764,0.07560229301452637,0.0734708309173584,0.07350492477416992,0.07395386695861816,0.08442139625549316,0.07197117805480957,0.07992243766784668,0.07116508483886719,0.07975912094116211,0.07225298881530762,0.07234740257263184,0.07349014282226562,0.13744187355041504,0.2065737247467041,3.2731330394744873,0.5714869499206543,0.07158112525939941,0.07224607467651367,0.07248187065124512,0.07224392890930176,0.08255743980407715 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 b1c80bcd65..210bce78e1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,True,40,122,1784,3,True,40,Tests_passed,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,True,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,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,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,585f65848077134b185f057dc1a9c6f1bca8c2d12bf1d3dbbd812aada05bed50,Tests_failed,2d175f623830797d4e432ee1355fe144d5f6f303de86be7512ce8d7e4aa5b01d,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,0.06071805953979492,0.05594897270202637,0.07062172889709473,0.024700164794921875,0.07303500175476074,0.0609433650970459,0.061292171478271484,0.1522512435913086,0.1570422649383545,0.5640630722045898,0.8307290077209473,0.0467371940612793,0.0903623104095459,0.04749631881713867,0.09199023246765137,0.09263014793395996 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,True,40,122,1784,3,True,40,Tests_passed,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,True,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,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,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,585f65848077134b185f057dc1a9c6f1bca8c2d12bf1d3dbbd812aada05bed50,Tests_failed,2d175f623830797d4e432ee1355fe144d5f6f303de86be7512ce8d7e4aa5b01d,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,Tests_passed,5e74eacc45f8e8d1e8612596d203f7b7fa2b71da7c863011cfe979376d8ddc1a,0.06071805953979492,0.05594897270202637,0.07062172889709473,0.024700164794921875,0.07303500175476074,0.0609433650970459,0.061292171478271484,0.1522512435913086,0.1570422649383545,0.5640630722045898,0.8307290077209473,0.0467371940612793,0.0903623104095459,0.04749631881713867,0.09199023246765137,0.09263014793395996,0.09178638458251953,0.09225916862487793,0.09281659126281738,0.09213685989379883,0.09177041053771973,0.09268450736999512,0.09364724159240723,0.15067410469055176,0.15217876434326172,0.6659955978393555,0.9964842796325684,0.09028458595275879,0.08957171440124512,0.09215807914733887,0.09313225746154785,0.09176850318908691 diff --git a/results/combined/merges_timed/snazy/ohc.csv b/results/combined/merges_timed/snazy/ohc.csv index fea8cdbe3b..29d7521967 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,Tests_passed,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,True,33,162,958,6,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,True,34,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,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,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,a7bd652dd0386b962f2ef2bed2efe4275883509cf09a38df665aeb37e571b2f4,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,0.04987931251525879,0.05515909194946289,0.0626986026763916,0.033646345138549805,0.07596349716186523,0.06566143035888672,0.058216094970703125,0.3641183376312256,0.2866528034210205,3.735194206237793,0.8739743232727051,0.050470590591430664,0.14998459815979004,0.05222463607788086,0.133819580078125,0.14836716651916504 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,Tests_passed,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,True,33,162,958,6,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,True,34,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,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,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,a7bd652dd0386b962f2ef2bed2efe4275883509cf09a38df665aeb37e571b2f4,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,0.04987931251525879,0.05515909194946289,0.0626986026763916,0.033646345138549805,0.07596349716186523,0.06566143035888672,0.058216094970703125,0.3641183376312256,0.2866528034210205,3.735194206237793,0.8739743232727051,0.050470590591430664,0.14998459815979004,0.05222463607788086,0.133819580078125,0.14836716651916504,0.1424732208251953,0.13543415069580078,0.14868760108947754,0.13492465019226074,0.14779973030090332,0.13565468788146973,0.14805960655212402,0.22916269302368164,0.2523524761199951,4.247342109680176,1.0376276969909668,0.1459791660308838,0.13588213920593262,0.14261245727539062,0.1379094123840332,0.1448678970336914 diff --git a/results/combined/merges_timed/sndyuk/logback-more-appenders.csv b/results/combined/merges_timed/sndyuk/logback-more-appenders.csv index d08e63a5ad..85b2dc7f2a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,True,True,Tests_passed,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,True,4,21,90,3,True,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,True,4,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,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,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,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,5daffbd6ed18a85767f5b221063ea3db887e66d9600af8ed66f2974e20e12bde,Tests_passed,443e0b485d9047a48ebe7249710bfb48522db8a19eeda5b8e5d6658e87f5b217,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,0.044792890548706055,0.04378008842468262,0.04364824295043945,0.014041900634765625,0.04381823539733887,0.04122591018676758,0.03301572799682617,0.22879815101623535,0.16487836837768555,0.9326791763305664,0.4655768871307373,0.02998185157775879,0.07372713088989258,0.029408693313598633,0.07365632057189941,0.0729379653930664 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,True,True,Tests_passed,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,True,4,21,90,3,True,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,True,4,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,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,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,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,5daffbd6ed18a85767f5b221063ea3db887e66d9600af8ed66f2974e20e12bde,Tests_passed,443e0b485d9047a48ebe7249710bfb48522db8a19eeda5b8e5d6658e87f5b217,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,0.044792890548706055,0.04378008842468262,0.04364824295043945,0.014041900634765625,0.04381823539733887,0.04122591018676758,0.03301572799682617,0.22879815101623535,0.16487836837768555,0.9326791763305664,0.4655768871307373,0.02998185157775879,0.07372713088989258,0.029408693313598633,0.07365632057189941,0.0729379653930664,0.07032632827758789,0.0702657699584961,0.0682063102722168,0.06999421119689941,0.06888008117675781,0.06996321678161621,0.06903648376464844,0.11585187911987305,0.12187480926513672,0.9664103984832764,0.47955751419067383,0.06807303428649902,0.06922316551208496,0.06956744194030762,0.06984210014343262,0.06832003593444824 diff --git a/results/combined/merges_timed/soabase/exhibitor.csv b/results/combined/merges_timed/soabase/exhibitor.csv index 04b1253cc8..5bcee55aca 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,True,51,143,1676,6,True,51,Tests_passed,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,True,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,True,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,161aa20d88da027986c097f66b280b1c7df17e069b05cf196d09f691440a127a,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Tests_failed,53d2b1b10d7a2944a83064f5ddbc2000660ad2ac638790554f74ddcec760781c,Merge_failed,c035b440f9ec14c0a5f6a6134d719c825cb434905e44e2b5107e4623aa9ffa99,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,3d0caa238d1fc5d028a63840afcd364a32419633f7d5625e5e890b18a6a5b439,Merge_failed,7862f30e3a7fa7bd0b54a0fc316069f5efac200bb4ce63f91bddca6ca2653f36,Merge_failed,fcb29fbae580b642bc720eaa156854f95f92e85ebdd61395b3ce02ab42d6e356,Tests_failed,ee58831b359dae6bb3ffc460224cc88602b47124e5c66e36c050614deb03d7fb,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,0.06190800666809082,0.038482666015625,0.0528407096862793,0.03894948959350586,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.3454859256744385,3.250204563140869,0.7379119396209717,0.08621740341186523,0.1693880558013916,0.06309962272644043,0.1589183807373047,0.17555522918701172 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,True,51,143,1676,6,True,51,Tests_passed,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,True,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,True,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,161aa20d88da027986c097f66b280b1c7df17e069b05cf196d09f691440a127a,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Tests_failed,53d2b1b10d7a2944a83064f5ddbc2000660ad2ac638790554f74ddcec760781c,Merge_failed,c035b440f9ec14c0a5f6a6134d719c825cb434905e44e2b5107e4623aa9ffa99,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,3d0caa238d1fc5d028a63840afcd364a32419633f7d5625e5e890b18a6a5b439,Merge_failed,7862f30e3a7fa7bd0b54a0fc316069f5efac200bb4ce63f91bddca6ca2653f36,Merge_failed,fcb29fbae580b642bc720eaa156854f95f92e85ebdd61395b3ce02ab42d6e356,Tests_failed,ee58831b359dae6bb3ffc460224cc88602b47124e5c66e36c050614deb03d7fb,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,62f8cddf18ce132f719814ed7c94a421b66b80d80baf1382da43f175dce2668d,Merge_failed,2fc3e2904627e764eb79ac7d5a348b8417aac076445339361075ba4d21ddcf5f,0.06190800666809082,0.038482666015625,0.0528407096862793,0.03894948959350586,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.3454859256744385,3.250204563140869,0.7379119396209717,0.08621740341186523,0.1693880558013916,0.06309962272644043,0.1589183807373047,0.17555522918701172,0.13026642799377441,0.16573810577392578,0.13390183448791504,0.13412022590637207,0.1699831485748291,0.13321447372436523,0.13487768173217773,0.26178526878356934,0.2883458137512207,3.3003103733062744,0.8938241004943848,0.16218209266662598,0.16675949096679688,0.13152766227722168,0.15270495414733887,0.16666626930236816 diff --git a/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv b/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv index 59567db990..5639166e2b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,False,True,7,14,51,3,True,7,Tests_passed,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,True,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,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,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,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,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,4c7a9fea66ca2f29cbf341e9e11b67eccf5c5f961d67d8f9fad593102374f8d7,Tests_failed,e8cdc0caafd63b46dd1ef57ef46ba21ed713714a3119daa29a596f74f1694e48,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,0.03930974006652832,0.05469465255737305,0.044381141662597656,0.018713951110839844,0.05128622055053711,0.04402661323547363,0.05203676223754883,0.2496962547302246,0.16327238082885742,2.430676221847534,0.5148074626922607,0.034500837326049805,0.0855565071105957,0.03499913215637207,0.08231544494628906,0.08487796783447266 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,False,True,7,14,51,3,True,7,Tests_passed,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,True,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,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,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,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,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,4c7a9fea66ca2f29cbf341e9e11b67eccf5c5f961d67d8f9fad593102374f8d7,Tests_failed,e8cdc0caafd63b46dd1ef57ef46ba21ed713714a3119daa29a596f74f1694e48,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,0.03930974006652832,0.05469465255737305,0.044381141662597656,0.018713951110839844,0.05128622055053711,0.04402661323547363,0.05203676223754883,0.2496962547302246,0.16327238082885742,2.430676221847534,0.5148074626922607,0.034500837326049805,0.0855565071105957,0.03499913215637207,0.08231544494628906,0.08487796783447266,0.08468866348266602,0.08352494239807129,0.08721661567687988,0.08532261848449707,0.08470416069030762,0.08540129661560059,0.08530735969543457,0.13598084449768066,0.14520859718322754,2.8222908973693848,0.6156208515167236,0.08266878128051758,0.08300423622131348,0.08206653594970703,0.08463311195373535,0.08599972724914551 diff --git a/results/combined/merges_timed/sockeqwe/annotatedadapter.csv b/results/combined/merges_timed/sockeqwe/annotatedadapter.csv index 68a1f32166..913c156870 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,True,4,10,44,19,True,19,Tests_passed,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,True,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,True,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,05a5f1a4e82cc3ece27e0fffcddadc5f4b9d5cb936f62139709a54de8e625dc1,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,39ba91439d1f7babb6807a7395126bb85ba9ed38b6a5ccc3ba5cf9fbfb72acdc,Merge_failed,09312257e03edc924a98072bc614c8872ae0d4e63630685df63894fe22efe62e,Merge_failed,09312257e03edc924a98072bc614c8872ae0d4e63630685df63894fe22efe62e,Merge_failed,21dc9de60620321edffda4c592f65c4042d68234d4e7ace3181b963886db48d7,Merge_failed,2205934c08e61fa3468a3eedd2b92f369c49adb8ab5dbc9fd9af9549770e4d9e,Merge_failed,9f65bc19c435ed1bd96d9659aa97c1052257b39a1c025eee0a20a87fb035e9fd,Merge_failed,7091e8318bc1c426bc901a83edb4312798bb0131cd83a9d2f5c5ba72b416559f,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,0.04201340675354004,0.04259824752807617,0.03926396369934082,0.013730764389038086,0.011531829833984375,0.04198503494262695,0.037132978439331055,0.2854464054107666,0.23096537590026855,1.1284871101379395,0.3957228660583496,0.044103145599365234,0.06567072868347168,0.04406619071960449,0.06641530990600586,0.06510210037231445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,True,4,10,44,19,True,19,Tests_passed,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,True,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,True,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,05a5f1a4e82cc3ece27e0fffcddadc5f4b9d5cb936f62139709a54de8e625dc1,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,39ba91439d1f7babb6807a7395126bb85ba9ed38b6a5ccc3ba5cf9fbfb72acdc,Merge_failed,09312257e03edc924a98072bc614c8872ae0d4e63630685df63894fe22efe62e,Merge_failed,09312257e03edc924a98072bc614c8872ae0d4e63630685df63894fe22efe62e,Merge_failed,21dc9de60620321edffda4c592f65c4042d68234d4e7ace3181b963886db48d7,Merge_failed,2205934c08e61fa3468a3eedd2b92f369c49adb8ab5dbc9fd9af9549770e4d9e,Merge_failed,9f65bc19c435ed1bd96d9659aa97c1052257b39a1c025eee0a20a87fb035e9fd,Merge_failed,7091e8318bc1c426bc901a83edb4312798bb0131cd83a9d2f5c5ba72b416559f,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,3cda1abadb54999b74709b9c850b9bf1fcb5a8266a3d55e6f52ca375e5ae625b,Merge_failed,fe2c63c932e2c4c88f4d207cbc01314ea5d115d923cfc6884ca9a20163974f99,0.04201340675354004,0.04259824752807617,0.03926396369934082,0.013730764389038086,0.011531829833984375,0.04198503494262695,0.037132978439331055,0.2854464054107666,0.23096537590026855,1.1284871101379395,0.3957228660583496,0.044103145599365234,0.06567072868347168,0.04406619071960449,0.06641530990600586,0.06510210037231445,0.06570267677307129,0.06425666809082031,0.06442570686340332,0.06668972969055176,0.06617045402526855,0.06669235229492188,0.06625628471374512,0.13068914413452148,0.1638927459716797,1.2871387004852295,0.4886298179626465,0.06668329238891602,0.06522703170776367,0.06559610366821289,0.06599736213684082,0.06529784202575684 diff --git a/results/combined/merges_timed/sockeqwe/fragmentargs.csv b/results/combined/merges_timed/sockeqwe/fragmentargs.csv index 65ec0f0881..60fcc12774 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,True,True,Tests_passed,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,True,6,10,41,2,True,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,True,6,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,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,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,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,5abf852eaead56dca7ac6ed0a153342ea133ed463431040448b57db54615a20f,Tests_failed,45a4a7bbdb86637e51779f331d3adb3837a0849726f2100fc24b9e63dd6cce85,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,0.050516605377197266,0.04752826690673828,0.047812461853027344,0.017032384872436523,0.0478823184967041,0.04660606384277344,0.04710865020751953,0.11432290077209473,0.10444259643554688,1.5301034450531006,0.39453792572021484,0.03386354446411133,0.06141066551208496,0.03388524055480957,0.06105351448059082,0.06284117698669434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,True,True,Tests_passed,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,True,6,10,41,2,True,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,True,6,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,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,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,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,5abf852eaead56dca7ac6ed0a153342ea133ed463431040448b57db54615a20f,Tests_failed,45a4a7bbdb86637e51779f331d3adb3837a0849726f2100fc24b9e63dd6cce85,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,0.050516605377197266,0.04752826690673828,0.047812461853027344,0.017032384872436523,0.0478823184967041,0.04660606384277344,0.04710865020751953,0.11432290077209473,0.10444259643554688,1.5301034450531006,0.39453792572021484,0.03386354446411133,0.06141066551208496,0.03388524055480957,0.06105351448059082,0.06284117698669434,0.06245613098144531,0.06287574768066406,0.06071972846984863,0.06353902816772461,0.06389141082763672,0.06438517570495605,0.06119680404663086,0.09794306755065918,0.09618806838989258,1.6090342998504639,0.47133946418762207,0.06016278266906738,0.06188607215881348,0.06011319160461426,0.060595035552978516,0.06260085105895996 diff --git a/results/combined/merges_timed/socketio4netty/socketio4j.csv b/results/combined/merges_timed/socketio4netty/socketio4j.csv index 9c781e8ba6..c985578287 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,True,23,73,440,2,True,23,Tests_passed,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,True,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,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,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,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,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_failed,52269cc353d4f71d92dcab0e76182f0d3a5206b50b045d64df7c988f8d84865a,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,0.04577493667602539,0.04224586486816406,0.037161827087402344,0.020891904830932617,0.047486066818237305,0.057264089584350586,0.05083060264587402,0.17453527450561523,0.12903261184692383,0.465667724609375,0.5231876373291016,0.040941715240478516,0.06421113014221191,0.04002737998962402,0.06246304512023926,0.06277203559875488 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,True,23,73,440,2,True,23,Tests_passed,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,True,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,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,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,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,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_failed,52269cc353d4f71d92dcab0e76182f0d3a5206b50b045d64df7c988f8d84865a,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,0.04577493667602539,0.04224586486816406,0.037161827087402344,0.020891904830932617,0.047486066818237305,0.057264089584350586,0.05083060264587402,0.17453527450561523,0.12903261184692383,0.465667724609375,0.5231876373291016,0.040941715240478516,0.06421113014221191,0.04002737998962402,0.06246304512023926,0.06277203559875488,0.061818838119506836,0.06309103965759277,0.06652116775512695,0.06648802757263184,0.06605410575866699,0.06492209434509277,0.0637350082397461,0.09933090209960938,0.09863424301147461,0.5557358264923096,0.5841176509857178,0.06317353248596191,0.06263279914855957,0.06231093406677246,0.06376409530639648,0.0638725757598877 diff --git a/results/combined/merges_timed/sofastack/sofa-bolt.csv b/results/combined/merges_timed/sofastack/sofa-bolt.csv index 5d8f2cc1cf..7c01ab0cbc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,Tests_passed,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,True,216,252,659.0,10,True,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,True,216,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,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,Merge_failed,eee7719f965f83c7fe7f505ec718901458a3ee011a0424762c2a602454e5af7e,Merge_failed,390b1b8eab98f6efc12e17581d690a91417849dbd4b86474ddb2342c4b7cb69a,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,b76899899c6c47f0aa40cda51929a0fe3095e7fec67da81438db7379fcba9ca4,Merge_failed,3c474400cf357ebe65e51b35fc5e044505d4729ccdc378771f4c96cc743caf13,Merge_failed,917e8829d2018cc3b24666e02081b21dc027dd9e26132e356ad1178ad9854689,Tests_failed,1f1d041134e7ec4fcdea9362d70e5e9da58f1420f1501a5be5e1d225acff5dcd,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.04056978225708008,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.5613417625427246,6.123358249664307,1.8316898345947266,0.09993624687194824,0.2315969467163086,0.09295415878295898,0.2536966800689697,0.24758267402648926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,Tests_passed,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,True,216,252,659.0,10,True,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,True,216,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,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,Merge_failed,eee7719f965f83c7fe7f505ec718901458a3ee011a0424762c2a602454e5af7e,Merge_failed,390b1b8eab98f6efc12e17581d690a91417849dbd4b86474ddb2342c4b7cb69a,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,b76899899c6c47f0aa40cda51929a0fe3095e7fec67da81438db7379fcba9ca4,Merge_failed,3c474400cf357ebe65e51b35fc5e044505d4729ccdc378771f4c96cc743caf13,Merge_failed,917e8829d2018cc3b24666e02081b21dc027dd9e26132e356ad1178ad9854689,Tests_failed,1f1d041134e7ec4fcdea9362d70e5e9da58f1420f1501a5be5e1d225acff5dcd,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,80532f2534f18437fb4dca61d5b5bd6a7603ec7aad740dd3cb81707aea187bed,Merge_failed,9e9eade00f28310923302811e90d5ef9d82ecd53ec8de3cbca343bde898b84ee,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.04056978225708008,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.5613417625427246,6.123358249664307,1.8316898345947266,0.09993624687194824,0.2315969467163086,0.09295415878295898,0.2536966800689697,0.24758267402648926,0.22662854194641113,0.22462010383605957,0.2326657772064209,0.23121166229248047,0.23587322235107422,0.22679948806762695,0.23659682273864746,0.4017922878265381,0.46920299530029297,6.357507944107056,1.9924945831298828,0.22575831413269043,0.22522783279418945,0.23731470108032227,0.22710371017456055,0.22659897804260254 diff --git a/results/combined/merges_timed/softinstigate/restheart.csv b/results/combined/merges_timed/softinstigate/restheart.csv index 069f1e9e63..6144440397 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -153,refs/remotes/origin/4.1.x,ef75e2ee223cd17f1f8d37bf30a3d9e193e77eac,44c6c13c0ce36263ed4dd3a6d6135c6eae02e64a,66eca10811db469358f72d28247700249d60a0bc,,True,True,True,164,878,8649,21,True,167,Tests_passed,b869c71dbdb92ed12aaa4d800f67d8e89074a3714cd0af5105f31789d35a566f,True,Tests_passed,e6a2bf7f4c3967422dba06313d49dfd4e521c19776f3b6a47efddfb7920638e8,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,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,d8ad931a048544fe75da3bf05b7de624502d2f92bd2102db071e1232ceebd866,Merge_failed,eec87e7ed2a4c539c67accb9347ddb62df35d9c5f4ba333cc000fd934fc6f83e,Merge_failed,564e174d5814982cc312b241355a5b50c15d874f15fe04a155e695e773b9059e,Merge_failed,f8b1dcf0aa7062539dbe62cff645bb233f4b27867e28abe370984a5a8c10d178,Merge_failed,d342ec1f5123160b86bf3b757d042e17e5d5ef5493f00f21d51b074ca2c97182,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,b969613524e2c269d522faa87d6f7a551eb493c352e1c0e3277ee5c8b2458242,Merge_failed,d62eab4dc160d138eac54599e18468a542e48e93d1030a535618a803e2c480bd,Merge_failed,d62eab4dc160d138eac54599e18468a542e48e93d1030a535618a803e2c480bd,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bc61aa7d5f96ab31e62bf9192aed8e15a1fbe06e08986eddbcc966311e1d6fbf,Merge_failed,9a7dca6ceaf31d7abb0b903d5f4cec815da0553747a8e0e0f2baefeafec0c97d,Merge_failed,5b626aa7828b152fa6de83fe4a16da72d45681ba322fd41fb8a7bdc8171b79b1,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,0.02738666534423828,0.029784440994262695,0.030854463577270508,0.04226517677307129,0.030838727951049805,0.031493186950683594,0.031028032302856445,0.28580403327941895,0.9730720520019531,12.200442790985107,7.425472974777222,0.19681835174560547,0.3505868911743164,0.19959568977355957,0.3573272228240967,0.3622286319732666 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +153,refs/remotes/origin/4.1.x,ef75e2ee223cd17f1f8d37bf30a3d9e193e77eac,44c6c13c0ce36263ed4dd3a6d6135c6eae02e64a,66eca10811db469358f72d28247700249d60a0bc,,True,True,True,164,878,8649,21,True,167,Tests_passed,b869c71dbdb92ed12aaa4d800f67d8e89074a3714cd0af5105f31789d35a566f,True,Tests_passed,e6a2bf7f4c3967422dba06313d49dfd4e521c19776f3b6a47efddfb7920638e8,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,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,d8ad931a048544fe75da3bf05b7de624502d2f92bd2102db071e1232ceebd866,Merge_failed,eec87e7ed2a4c539c67accb9347ddb62df35d9c5f4ba333cc000fd934fc6f83e,Merge_failed,564e174d5814982cc312b241355a5b50c15d874f15fe04a155e695e773b9059e,Merge_failed,f8b1dcf0aa7062539dbe62cff645bb233f4b27867e28abe370984a5a8c10d178,Merge_failed,d342ec1f5123160b86bf3b757d042e17e5d5ef5493f00f21d51b074ca2c97182,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,b969613524e2c269d522faa87d6f7a551eb493c352e1c0e3277ee5c8b2458242,Merge_failed,d62eab4dc160d138eac54599e18468a542e48e93d1030a535618a803e2c480bd,Merge_failed,d62eab4dc160d138eac54599e18468a542e48e93d1030a535618a803e2c480bd,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bc61aa7d5f96ab31e62bf9192aed8e15a1fbe06e08986eddbcc966311e1d6fbf,Merge_failed,9a7dca6ceaf31d7abb0b903d5f4cec815da0553747a8e0e0f2baefeafec0c97d,Merge_failed,5b626aa7828b152fa6de83fe4a16da72d45681ba322fd41fb8a7bdc8171b79b1,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,bb40d980c6905ad6ec09769ed4ea6aa2193111a39b31923e1614a9981640b18e,Merge_failed,f931bbdf2673d279ef6a23033effd0c170860a749b6dda0a174f5fcd3b153eb9,0.02738666534423828,0.029784440994262695,0.030854463577270508,0.04226517677307129,0.030838727951049805,0.031493186950683594,0.031028032302856445,0.28580403327941895,0.9730720520019531,12.200442790985107,7.425472974777222,0.19681835174560547,0.3505868911743164,0.19959568977355957,0.3573272228240967,0.3622286319732666,0.3595142364501953,0.3679344654083252,0.3628718852996826,0.37214088439941406,0.3650014400482178,0.37443089485168457,0.3733241558074951,0.7095232009887695,0.8603768348693848,14.409790515899658,8.14609146118164,0.3726663589477539,0.36243391036987305,0.3675086498260498,0.3722226619720459,0.3564157485961914 diff --git a/results/combined/merges_timed/solita/functional-utils.csv b/results/combined/merges_timed/solita/functional-utils.csv index 088291a463..cfb20f1783 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,True,46,273,1424.0,2,True,46,Tests_passed,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,True,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,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,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,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,ed033a1dcdb43949651de3c2a5c5faaadb3d9dd449105bbc42bd0b40abcc58f4,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,0.05056142807006836,0.04099106788635254,0.06392908096313477,0.025435924530029297,0.06912565231323242,0.059584617614746094,0.03641843795776367,0.1906442642211914,0.12222552299499512,1.0600824356079102,1.1754646301269531,0.045586585998535156,0.07162189483642578,0.0459444522857666,0.07223081588745117,0.07451510429382324 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,True,46,273,1424.0,2,True,46,Tests_passed,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,True,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,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,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,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,ed033a1dcdb43949651de3c2a5c5faaadb3d9dd449105bbc42bd0b40abcc58f4,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,0.05056142807006836,0.04099106788635254,0.06392908096313477,0.025435924530029297,0.06912565231323242,0.059584617614746094,0.03641843795776367,0.1906442642211914,0.12222552299499512,1.0600824356079102,1.1754646301269531,0.045586585998535156,0.07162189483642578,0.0459444522857666,0.07223081588745117,0.07451510429382324,0.06976747512817383,0.06883740425109863,0.07077908515930176,0.07473039627075195,0.06341409683227539,0.0724325180053711,0.07368206977844238,0.10792064666748047,0.10029482841491699,1.0991036891937256,1.2631645202636719,0.0718233585357666,0.06406617164611816,0.07010936737060547,0.06911349296569824,0.06895232200622559 diff --git a/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv b/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv index 642808fd94..8344a22660 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,True,18,47,513,2,True,18,Tests_passed,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,True,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,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,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,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,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,503dbceb908f9fcd19b74d153de5b9afb2072c16de3192c7575a170c0fd98f07,Tests_passed,bd27bec3200d847fd5985eb44c939648724d8a24fa73b406db9e6ade7634cd4b,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,0.05016827583312988,0.041754722595214844,0.046508073806762695,0.01973438262939453,0.048126220703125,0.053401947021484375,0.05227398872375488,0.18311381340026855,0.11677861213684082,0.5188345909118652,0.6541435718536377,0.03645014762878418,0.0602724552154541,0.03666090965270996,0.05919909477233887,0.059694766998291016 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,True,18,47,513,2,True,18,Tests_passed,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,True,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,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,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,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,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,503dbceb908f9fcd19b74d153de5b9afb2072c16de3192c7575a170c0fd98f07,Tests_passed,bd27bec3200d847fd5985eb44c939648724d8a24fa73b406db9e6ade7634cd4b,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,0.05016827583312988,0.041754722595214844,0.046508073806762695,0.01973438262939453,0.048126220703125,0.053401947021484375,0.05227398872375488,0.18311381340026855,0.11677861213684082,0.5188345909118652,0.6541435718536377,0.03645014762878418,0.0602724552154541,0.03666090965270996,0.05919909477233887,0.059694766998291016,0.05818819999694824,0.05990481376647949,0.060167789459228516,0.05837678909301758,0.059873342514038086,0.05904650688171387,0.0620114803314209,0.09750032424926758,0.09270477294921875,0.6359095573425293,0.7123298645019531,0.05922555923461914,0.06016826629638672,0.058876991271972656,0.059914588928222656,0.05997347831726074 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv b/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv index c31ceee69e..be2d22769c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,True,7,13,817,2,True,7,Tests_passed,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,True,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,e851aa260f00cb2a5b7312a2d88b87625c21174c070ef89832ee25d156c38570,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,2400f4d0ef8a32cec1ba5a1da52a4120f07fa05941b22f55d088629fe1537ebb,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,0.038768768310546875,0.03595995903015137,0.036933183670043945,0.013067007064819336,0.040004730224609375,0.03994417190551758,0.03907942771911621,0.09037613868713379,0.1091151237487793,0.5784099102020264,-1.0,0.03963947296142578,0.04171395301818848,0.038991451263427734,0.04110097885131836,0.04166865348815918 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,True,7,13,817,2,True,7,Tests_passed,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,True,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,e851aa260f00cb2a5b7312a2d88b87625c21174c070ef89832ee25d156c38570,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,2400f4d0ef8a32cec1ba5a1da52a4120f07fa05941b22f55d088629fe1537ebb,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,0.038768768310546875,0.03595995903015137,0.036933183670043945,0.013067007064819336,0.040004730224609375,0.03994417190551758,0.03907942771911621,0.09037613868713379,0.1091151237487793,0.5784099102020264,-1.0,0.03963947296142578,0.04171395301818848,0.038991451263427734,0.04110097885131836,0.04166865348815918,0.04254436492919922,0.04158592224121094,0.04108738899230957,0.041208505630493164,0.04081130027770996,0.042124271392822266,0.04261016845703125,0.0728461742401123,0.08129382133483887,0.6517164707183838,-1.0,0.043179988861083984,0.042519569396972656,0.041940927505493164,0.04222726821899414,0.042307138442993164 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv b/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv index a714fb1d32..2a7595a07a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,True,31,186,3936,32,True,32,Tests_passed,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,True,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Tests_failed,bd26361dc8dbec425b786b6cd75b65cf6afd6f857c70aa25d21e82d94b222b7e,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,72c100330b45e04f4062ae4f972b36fb87f21a0d53f24d0a4cf220c4b9520c43,Merge_failed,72c100330b45e04f4062ae4f972b36fb87f21a0d53f24d0a4cf220c4b9520c43,Merge_failed,f3bab7865f90110cb492e7abb3851e1f24eebbc112afefbd8a22490447682e83,Merge_failed,521249546c0e83c36a97447690ad4b409f6e0e0d796b2a26989453c7ec10588f,Merge_failed,2af35ef82a46bc590ba433ed72b7a7a1a571dc798f8beb515b97acf60100ce59,Merge_failed,7a23f3d1b62424e4924b1f9185224879a61aaa4d604d598cbb04783af00cee39,Tests_failed,d7603cc2da2fd3f27e1b4025adacb5083fca2fcf1822cc728a24c58461293dbe,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,0.06477665901184082,0.05567026138305664,0.05591535568237305,0.020624876022338867,0.04359006881713867,0.053417205810546875,0.05775618553161621,1.9883637428283691,2.130169153213501,15.511932134628296,0.4779174327850342,0.3807229995727539,0.3780336380004883,0.42746424674987793,0.5087499618530273,0.5588867664337158 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,True,31,186,3936,32,True,32,Tests_passed,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,True,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Tests_failed,bd26361dc8dbec425b786b6cd75b65cf6afd6f857c70aa25d21e82d94b222b7e,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,Merge_failed,72c100330b45e04f4062ae4f972b36fb87f21a0d53f24d0a4cf220c4b9520c43,Merge_failed,72c100330b45e04f4062ae4f972b36fb87f21a0d53f24d0a4cf220c4b9520c43,Merge_failed,f3bab7865f90110cb492e7abb3851e1f24eebbc112afefbd8a22490447682e83,Merge_failed,521249546c0e83c36a97447690ad4b409f6e0e0d796b2a26989453c7ec10588f,Merge_failed,2af35ef82a46bc590ba433ed72b7a7a1a571dc798f8beb515b97acf60100ce59,Merge_failed,7a23f3d1b62424e4924b1f9185224879a61aaa4d604d598cbb04783af00cee39,Tests_failed,d7603cc2da2fd3f27e1b4025adacb5083fca2fcf1822cc728a24c58461293dbe,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,51ea7ee39991b302249ba672cd523fe8ce9c1a2a739e0975e7bda42cf7caf373,Merge_failed,6bf92452ef7a44ac394f509bc652ac0fe3f1e6bb9e14ec55771339a7329d7d35,0.06477665901184082,0.05567026138305664,0.05591535568237305,0.020624876022338867,0.04359006881713867,0.053417205810546875,0.05775618553161621,1.9883637428283691,2.130169153213501,15.511932134628296,0.4779174327850342,0.3807229995727539,0.3780336380004883,0.42746424674987793,0.5087499618530273,0.5588867664337158,0.4872262477874756,0.5279591083526611,0.48664116859436035,0.5302474498748779,0.5104782581329346,0.5030500888824463,0.5005624294281006,0.9840378761291504,1.431291103363037,16.074230909347534,1.0180699825286865,0.48760175704956055,0.48979735374450684,0.48758363723754883,0.4779343605041504,0.5281467437744141 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-php.csv b/results/combined/merges_timed/sonarcommunity/sonar-php.csv index 987d9e7ab7..f2570c3be0 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/remotes/origin/pull/536,ad3b13cdd68bfd6e2cd944ac3c10ab5cfa005135,a775f0a16cab51b5cfb2fed6c916ba2fa406fd6c,13e149f93c8a92a61ddbf8278a6bc489882fc7be,,True,True,Tests_passed,35397118277aa8a26d7627f2723806d736b9bcf7b99b7819acb351b23f812257,True,13.0,15,317,2,True,Tests_passed,3a4ce9f7e5757033ec26ccec4b9cba4c5d6017effd6f87dc1b5d4039be578740,True,14,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,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,12ed56e9f9823671f2417ce39262a48e9f9d013c00c0d8f736c1634790d65e5e,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,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,7f0249074fcbfbd332ab872ceacc63c41c0167f86a27c08e855dc148bfcf1f3b,Tests_passed,12ed56e9f9823671f2417ce39262a48e9f9d013c00c0d8f736c1634790d65e5e,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,0.016687870025634766,0.016593217849731445,0.018274545669555664,0.026543140411376953,0.017777204513549805,0.017873525619506836,0.018300294876098633,0.04727053642272949,0.07164621353149414,0.6551830768585205,0.3824324607849121,0.12853765487670898,0.1504650115966797,0.1300501823425293,0.14963126182556152,0.14968061447143555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/remotes/origin/pull/536,ad3b13cdd68bfd6e2cd944ac3c10ab5cfa005135,a775f0a16cab51b5cfb2fed6c916ba2fa406fd6c,13e149f93c8a92a61ddbf8278a6bc489882fc7be,,True,True,Tests_passed,35397118277aa8a26d7627f2723806d736b9bcf7b99b7819acb351b23f812257,True,13.0,15,317,2,True,Tests_passed,3a4ce9f7e5757033ec26ccec4b9cba4c5d6017effd6f87dc1b5d4039be578740,True,14,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,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,12ed56e9f9823671f2417ce39262a48e9f9d013c00c0d8f736c1634790d65e5e,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,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,7f0249074fcbfbd332ab872ceacc63c41c0167f86a27c08e855dc148bfcf1f3b,Tests_passed,12ed56e9f9823671f2417ce39262a48e9f9d013c00c0d8f736c1634790d65e5e,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,0.016687870025634766,0.016593217849731445,0.018274545669555664,0.026543140411376953,0.017777204513549805,0.017873525619506836,0.018300294876098633,0.04727053642272949,0.07164621353149414,0.6551830768585205,0.3824324607849121,0.12853765487670898,0.1504650115966797,0.1300501823425293,0.14963126182556152,0.14968061447143555,0.13899898529052734,0.14328598976135254,0.14479923248291016,0.1426093578338623,0.14505434036254883,0.14805889129638672,0.14868831634521484,0.18454599380493164,0.17264080047607422,0.8305811882019043,0.43837714195251465,0.14369678497314453,0.1432340145111084,0.1394805908203125,0.14557147026062012,0.14806675910949707 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv b/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv index 5cf80f3fcb..7b6bb65abe 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,True,253,640,6597,6,True,253,Tests_passed,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,True,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,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,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,Merge_failed,53791b30bb4a09739e671815c121c6c0a6200413170e3d4e0db62af94110c850,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8db4df23de44f4245a0c891e101045af4938b1908bb2400313975d2e14920b28,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,3182abaadc3ff8fa4757d0b9df61d57bcc79b417897e689bfef8dbf771def706,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,0.023099422454833984,0.023203611373901367,0.02489495277404785,0.032037973403930664,0.023604869842529297,0.024251461029052734,0.024379491806030273,0.10152220726013184,0.30505943298339844,1.9055724143981934,0.8020064830780029,0.11261248588562012,0.11111974716186523,0.11178064346313477,0.11720824241638184,0.12226343154907227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,True,253,640,6597,6,True,253,Tests_passed,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,True,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,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,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,Merge_failed,53791b30bb4a09739e671815c121c6c0a6200413170e3d4e0db62af94110c850,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8db4df23de44f4245a0c891e101045af4938b1908bb2400313975d2e14920b28,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,3182abaadc3ff8fa4757d0b9df61d57bcc79b417897e689bfef8dbf771def706,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,0.023099422454833984,0.023203611373901367,0.02489495277404785,0.032037973403930664,0.023604869842529297,0.024251461029052734,0.024379491806030273,0.10152220726013184,0.30505943298339844,1.9055724143981934,0.8020064830780029,0.11261248588562012,0.11111974716186523,0.11178064346313477,0.11720824241638184,0.12226343154907227,0.11311173439025879,0.12277913093566895,0.1143648624420166,0.1234743595123291,0.12462091445922852,0.12834477424621582,0.1332695484161377,0.22641396522521973,0.2995781898498535,2.32045841217041,0.914362907409668,0.11322212219238281,0.11441540718078613,0.1118309497833252,0.11360955238342285,0.12302374839782715 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv b/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv index bc2c1241ce..7879019def 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,True,True,Tests_passed,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,True,50,228,1473,3,True,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,True,51,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,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_timedout,,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,fd7e7b0093f4043f9727e235d67f4657636b2cbe02cd81a3e963da763975bf3d,Merge_failed,1ca6cf21c1ec540cdfa3fc595d08c63b1e771ea27ab90089fb7a6d2ada6c2425,Merge_failed,b883876a5119179b2ca2969f2d61f9af4e00b559c015b8ccc40b766f1e3bb73a,Merge_timedout,,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,0.011174440383911133,0.011368989944458008,0.011558294296264648,0.01901984214782715,0.0118408203125,0.011393308639526367,0.011681795120239258,0.048553466796875,0.12550759315490723,0.46546030044555664,-1.0,0.05593156814575195,0.06665396690368652,0.055342912673950195,0.0661308765411377,0.06518840789794922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,True,True,Tests_passed,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,True,50,228,1473,3,True,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,True,51,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,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_timedout,,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,fd7e7b0093f4043f9727e235d67f4657636b2cbe02cd81a3e963da763975bf3d,Merge_failed,1ca6cf21c1ec540cdfa3fc595d08c63b1e771ea27ab90089fb7a6d2ada6c2425,Merge_failed,b883876a5119179b2ca2969f2d61f9af4e00b559c015b8ccc40b766f1e3bb73a,Merge_timedout,,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,Merge_failed,dfffb52dbd21c3bd05e15f0a55bfbdd5bfd7d2f8812a85c432dc403e86a50457,0.011174440383911133,0.011368989944458008,0.011558294296264648,0.01901984214782715,0.0118408203125,0.011393308639526367,0.011681795120239258,0.048553466796875,0.12550759315490723,0.46546030044555664,-1.0,0.05593156814575195,0.06665396690368652,0.055342912673950195,0.0661308765411377,0.06518840789794922,0.06184124946594238,0.06325244903564453,0.06417012214660645,0.06339406967163086,0.06355166435241699,0.06318402290344238,0.06118607521057129,0.10886192321777344,0.1276869773864746,0.5496363639831543,-1.0,0.06253719329833984,0.0619959831237793,0.061570167541503906,0.06158256530761719,0.06283140182495117 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-web.csv b/results/combined/merges_timed/sonarcommunity/sonar-web.csv index a5d577961c..9d93bd034b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,Tests_passed,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,True,19,31,11733,3,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,20,True,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,ca8d60db0082d675bcc3b177f267a487ca325771cf096b3c11cfc6c520184c4c,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,7f6fe730f94059c1b428748f601cdfabe7f924c66bc978310f286b0afc697dbd,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,1fcb3fd4559c9db821d535eb1786b6dde36382e6b9761d2b4e73da189d26b2da,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,0.013602256774902344,0.013594627380371094,0.013042211532592773,0.020657777786254883,0.013762712478637695,0.01301884651184082,0.013196468353271484,0.07855415344238281,0.1291346549987793,0.5835535526275635,0.44565391540527344,0.06287145614624023,0.06311702728271484,0.06129765510559082,0.061524391174316406,0.0637674331665039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,Tests_passed,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,True,19,31,11733,3,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,20,True,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,ca8d60db0082d675bcc3b177f267a487ca325771cf096b3c11cfc6c520184c4c,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,7f6fe730f94059c1b428748f601cdfabe7f924c66bc978310f286b0afc697dbd,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,1fcb3fd4559c9db821d535eb1786b6dde36382e6b9761d2b4e73da189d26b2da,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,0.013602256774902344,0.013594627380371094,0.013042211532592773,0.020657777786254883,0.013762712478637695,0.01301884651184082,0.013196468353271484,0.07855415344238281,0.1291346549987793,0.5835535526275635,0.44565391540527344,0.06287145614624023,0.06311702728271484,0.06129765510559082,0.061524391174316406,0.0637674331665039,0.058115243911743164,0.0605320930480957,0.05867576599121094,0.05849504470825195,0.058990478515625,0.05863380432128906,0.061573028564453125,0.11148977279663086,0.12937688827514648,0.6643905639648438,0.47800302505493164,0.060456275939941406,0.060399532318115234,0.06132793426513672,0.0602264404296875,0.060288429260253906 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-xml.csv b/results/combined/merges_timed/sonarcommunity/sonar-xml.csv index cfeabd4e44..2b96d934d5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,True,23,117,624,143,True,153,Tests_passed,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,True,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,True,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,65539822e0d594d5630b4feabc46ce2239216cdec3c716d65c59073641653d7e,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,Merge_failed,023f26f6e866ea641703bbed0a1c5e8607c483b24233fd721f0f1214546a288e,Merge_failed,5c15e0e834a01436d7cf007dac58efd0cc3aaaf3c7b44f64b60199ee90b4f7c9,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,35f909281b113970e359b827eb47d9c27d80751d972a2e8705f1ac0d5c728be2,Merge_failed,d878574b8473e2055b7c0f654b95d2f7d34e95aa4e5b9bffac2f27f95f768296,Merge_failed,d878574b8473e2055b7c0f654b95d2f7d34e95aa4e5b9bffac2f27f95f768296,Merge_failed,fffed2eb1915ed638ce4fff06a3d0b1a4a4873d1b26c66d1cd92ce8bb46e6fac,Merge_failed,798fdbc3aca18bd3cae89a184d5ccd9faa0ab73b14c4e9298e21439052084b45,Merge_failed,43cf7ba44ac1b17a028d3096a8b4e0339cdebcd15aeb47a16ba829006a55b253,Merge_failed,b9a71b4e91a0fa332cd4310cd0e2555eac4f19100d5917b4ba2ad41029fa5f92,Merge_timedout,,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,0.02320241928100586,0.023861169815063477,0.026244640350341797,0.018720149993896484,0.02603626251220703,0.025902509689331055,0.025763511657714844,0.24013471603393555,0.936445951461792,9.596669435501099,-1.0,0.20116186141967773,0.2997581958770752,0.16610360145568848,0.26666855812072754,0.28383922576904297 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,True,23,117,624,143,True,153,Tests_passed,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,True,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,True,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,65539822e0d594d5630b4feabc46ce2239216cdec3c716d65c59073641653d7e,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,Merge_failed,023f26f6e866ea641703bbed0a1c5e8607c483b24233fd721f0f1214546a288e,Merge_failed,5c15e0e834a01436d7cf007dac58efd0cc3aaaf3c7b44f64b60199ee90b4f7c9,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,35f909281b113970e359b827eb47d9c27d80751d972a2e8705f1ac0d5c728be2,Merge_failed,d878574b8473e2055b7c0f654b95d2f7d34e95aa4e5b9bffac2f27f95f768296,Merge_failed,d878574b8473e2055b7c0f654b95d2f7d34e95aa4e5b9bffac2f27f95f768296,Merge_failed,fffed2eb1915ed638ce4fff06a3d0b1a4a4873d1b26c66d1cd92ce8bb46e6fac,Merge_failed,798fdbc3aca18bd3cae89a184d5ccd9faa0ab73b14c4e9298e21439052084b45,Merge_failed,43cf7ba44ac1b17a028d3096a8b4e0339cdebcd15aeb47a16ba829006a55b253,Merge_failed,b9a71b4e91a0fa332cd4310cd0e2555eac4f19100d5917b4ba2ad41029fa5f92,Merge_timedout,,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,48f51b2ef9a0ef340723cc005c7a8ad4d314495fc03f405a891d1b121d17e235,Merge_failed,c6610bd5b66b2684a010c310c3f5df2a78dad7fcc19a9744e843d7cc78bbff0c,0.02320241928100586,0.023861169815063477,0.026244640350341797,0.018720149993896484,0.02603626251220703,0.025902509689331055,0.025763511657714844,0.24013471603393555,0.936445951461792,9.596669435501099,-1.0,0.20116186141967773,0.2997581958770752,0.16610360145568848,0.26666855812072754,0.28383922576904297,0.30308032035827637,0.30524682998657227,0.3031032085418701,0.24805641174316406,0.2509453296661377,0.2755441665649414,0.28674983978271484,0.5191817283630371,0.711932897567749,10.113579988479614,-1.0,0.3021128177642822,0.29909563064575195,0.30077624320983887,0.247697114944458,0.25478219985961914 diff --git a/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv b/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv index 119e2eaa44..246a18d7ca 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,False,Tests_passed,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,True,113,119,264.0,2,True,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,True,113,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,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_failed,a915407e4740790c85461233cf70c15f04de238a93634b7b7bb256582e0441ba,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,0.06476116180419922,0.07024717330932617,0.05503273010253906,0.0357213020324707,0.0787506103515625,0.06492757797241211,0.06130838394165039,0.19928932189941406,0.10593771934509277,0.056282997131347656,0.9435052871704102,0.05781149864196777,0.07646822929382324,0.05683302879333496,0.07949995994567871,0.08233475685119629 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,False,Tests_passed,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,True,113,119,264.0,2,True,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,True,113,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,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_failed,a915407e4740790c85461233cf70c15f04de238a93634b7b7bb256582e0441ba,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,0.06476116180419922,0.07024717330932617,0.05503273010253906,0.0357213020324707,0.0787506103515625,0.06492757797241211,0.06130838394165039,0.19928932189941406,0.10593771934509277,0.056282997131347656,0.9435052871704102,0.05781149864196777,0.07646822929382324,0.05683302879333496,0.07949995994567871,0.08233475685119629,0.08054852485656738,0.07637619972229004,0.07869529724121094,0.08381891250610352,0.08302021026611328,0.07296586036682129,0.07803583145141602,0.11400604248046875,0.1149909496307373,0.08912301063537598,1.0219404697418213,0.07823777198791504,0.07953310012817383,0.08073544502258301,0.07839584350585938,0.077301025390625 diff --git a/results/combined/merges_timed/sonarsource/sonar-findbugs.csv b/results/combined/merges_timed/sonarsource/sonar-findbugs.csv index 6e4a27026f..fc3e88381e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -209,refs/remotes/origin/sq-10,185c5314e370b844d643c036c0bebada30bb7de6,863f3163111b75cc7bf2817f0d7862e3e7185807,8e93e5ab17b54ec7c3001ea623d999e1de863b86,,True,True,True,61,238,3938.0,6,True,61,Tests_passed,0cf61a3b4920d0659f046cc4e6d8512c0339f752894766dccd363a49fd791fa9,True,Tests_passed,eee6aac93552220e94ca101c359aeab1ab76c1b77e6d4e03d0e1b5fd45cbcc01,True,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,f96b5dcbbcd5831d454ad24a538104860df8884b25893fe71a2d4a619b9eac64,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,bb5251a64838f0fb84702275d27a145860b87df57f115e227344ab82e64ae051,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Tests_failed,0a8017340baf0544994926ddd6cda1c82aebc17af55a6b1a3c67ccae7954ead8,Merge_failed,735ce4d2f3df6d735fc9e7f998e3195689d9e48809cc704a87172f35746d664b,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,e3e4bff9ddb1ec07cf3944e0855e003a298ce824405df736fda6559faa0655db,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,54dda7c454afd481190e5000c8b6ad3dd158af7913a1ea8bed8a850326a04a7c,Merge_failed,af5d0d00b6434d15a0f6edd96a0cbfead1f06ee8b3c33d7c32d8151cc914ad3c,Merge_failed,a5ca005067b28b86f9397b3882a27f19288669c8d6998cef8b2b9c57666dd97c,Tests_failed,3a3ec9a3c652421c86921731c1d9152995b3974849312701a0a52bb05cde216c,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,0.0604248046875,0.05564546585083008,0.0479123592376709,0.05214977264404297,0.05476117134094238,0.03700375556945801,0.05029487609863281,0.40113019943237305,0.31797051429748535,3.243856430053711,1.7736895084381104,0.08080649375915527,0.12326359748840332,0.10165810585021973,0.16373848915100098,0.11898088455200195 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +209,refs/remotes/origin/sq-10,185c5314e370b844d643c036c0bebada30bb7de6,863f3163111b75cc7bf2817f0d7862e3e7185807,8e93e5ab17b54ec7c3001ea623d999e1de863b86,,True,True,True,61,238,3938.0,6,True,61,Tests_passed,0cf61a3b4920d0659f046cc4e6d8512c0339f752894766dccd363a49fd791fa9,True,Tests_passed,eee6aac93552220e94ca101c359aeab1ab76c1b77e6d4e03d0e1b5fd45cbcc01,True,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,f96b5dcbbcd5831d454ad24a538104860df8884b25893fe71a2d4a619b9eac64,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,bb5251a64838f0fb84702275d27a145860b87df57f115e227344ab82e64ae051,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Tests_failed,0a8017340baf0544994926ddd6cda1c82aebc17af55a6b1a3c67ccae7954ead8,Merge_failed,735ce4d2f3df6d735fc9e7f998e3195689d9e48809cc704a87172f35746d664b,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,e3e4bff9ddb1ec07cf3944e0855e003a298ce824405df736fda6559faa0655db,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,54dda7c454afd481190e5000c8b6ad3dd158af7913a1ea8bed8a850326a04a7c,Merge_failed,af5d0d00b6434d15a0f6edd96a0cbfead1f06ee8b3c33d7c32d8151cc914ad3c,Merge_failed,a5ca005067b28b86f9397b3882a27f19288669c8d6998cef8b2b9c57666dd97c,Tests_failed,3a3ec9a3c652421c86921731c1d9152995b3974849312701a0a52bb05cde216c,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,d5b319b5d525516c9f1c5321bef2d8ef0298c07dae51774c14b3183e9fe0f4f9,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,0.0604248046875,0.05564546585083008,0.0479123592376709,0.05214977264404297,0.05476117134094238,0.03700375556945801,0.05029487609863281,0.40113019943237305,0.31797051429748535,3.243856430053711,1.7736895084381104,0.08080649375915527,0.12326359748840332,0.10165810585021973,0.16373848915100098,0.11898088455200195,0.1652545928955078,0.11701059341430664,0.1934661865234375,0.13046813011169434,0.18843793869018555,0.1290137767791748,0.18746733665466309,0.2400660514831543,0.3195772171020508,3.8961591720581055,2.0069315433502197,0.12320756912231445,0.18004345893859863,0.1589200496673584,0.1423358917236328,0.15858840942382812 diff --git a/results/combined/merges_timed/sonatype/jgit.csv b/results/combined/merges_timed/sonatype/jgit.csv index 3f6e967b1c..1473f8f9fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,True,28,179,2745.0,25,True,50,Tests_passed,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,True,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,True,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,8e5d2dee98b55f33840e00467dceeac83d81a45000bd4e96df1a39ebf7736235,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,db9e2c32325f57573f1b9969de9c00ad0d87492d758241cfde90a658beb95e22,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,0.0584559440612793,0.02779841423034668,0.02100396156311035,0.023059844970703125,0.01661396026611328,0.015439033508300781,0.01610708236694336,0.07274246215820312,0.13216710090637207,0.031262874603271484,1.049753189086914,0.04680347442626953,0.048995018005371094,0.04654216766357422,0.048874616622924805,0.04889559745788574 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,True,28,179,2745.0,25,True,50,Tests_passed,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,True,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,True,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,8e5d2dee98b55f33840e00467dceeac83d81a45000bd4e96df1a39ebf7736235,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,db9e2c32325f57573f1b9969de9c00ad0d87492d758241cfde90a658beb95e22,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,0.0584559440612793,0.02779841423034668,0.02100396156311035,0.023059844970703125,0.01661396026611328,0.015439033508300781,0.01610708236694336,0.07274246215820312,0.13216710090637207,0.031262874603271484,1.049753189086914,0.04680347442626953,0.048995018005371094,0.04654216766357422,0.048874616622924805,0.04889559745788574,0.04664134979248047,0.047185659408569336,0.04632282257080078,0.04835820198059082,0.04789280891418457,0.04697990417480469,0.04972076416015625,0.10075259208679199,0.10845160484313965,0.06106162071228027,1.1315648555755615,0.04758644104003906,0.04565143585205078,0.04697704315185547,0.0468752384185791,0.04627513885498047 diff --git a/results/combined/merges_timed/sonatype/plexus-compiler.csv b/results/combined/merges_timed/sonatype/plexus-compiler.csv index 542edc9462..912fc7feb0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,True,True,True,3,5,83,2,True,3,Tests_passed,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,True,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,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,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,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,b6b475a3791cfb70ea49b0af65f7f54437db9ddddf8efd9c97bc4fd8752a3a6d,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,0.03644132614135742,0.03720378875732422,0.03164196014404297,0.022368192672729492,0.04146218299865723,0.03551912307739258,0.047429561614990234,0.13329625129699707,0.10052752494812012,1.1716594696044922,0.34188365936279297,0.04163408279418945,0.06982541084289551,0.0429990291595459,0.07068276405334473,0.06868696212768555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,True,True,True,3,5,83,2,True,3,Tests_passed,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,True,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,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,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,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,b6b475a3791cfb70ea49b0af65f7f54437db9ddddf8efd9c97bc4fd8752a3a6d,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,0.03644132614135742,0.03720378875732422,0.03164196014404297,0.022368192672729492,0.04146218299865723,0.03551912307739258,0.047429561614990234,0.13329625129699707,0.10052752494812012,1.1716594696044922,0.34188365936279297,0.04163408279418945,0.06982541084289551,0.0429990291595459,0.07068276405334473,0.06868696212768555,0.06518745422363281,0.07039952278137207,0.06778931617736816,0.06875896453857422,0.06847190856933594,0.06307101249694824,0.06892704963684082,0.1043856143951416,0.09875130653381348,1.0804052352905273,0.3649747371673584,0.0660245418548584,0.0664517879486084,0.0697929859161377,0.0660858154296875,0.06516146659851074 diff --git a/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv b/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv index ad39a93d71..7df311dca4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,True,False,True,2,3,3,2,True,2,Tests_passed,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,True,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,True,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f45f889ae4fcf16aba72b23a8819229366584fdad84bb4e6351917ada1e3c63e,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,49f53bee55c2d5e508083ad09ac872e28ba6d597e58431e00140f728068316d6,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,0.009229421615600586,0.00987696647644043,0.009827613830566406,0.014378547668457031,0.009278059005737305,0.009392261505126953,0.009252309799194336,0.037497758865356445,0.0749821662902832,0.02507472038269043,0.25144338607788086,0.04012942314147949,0.04133272171020508,0.04010653495788574,0.04267382621765137,0.04229927062988281 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,True,False,True,2,3,3,2,True,2,Tests_passed,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,True,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,True,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f45f889ae4fcf16aba72b23a8819229366584fdad84bb4e6351917ada1e3c63e,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,49f53bee55c2d5e508083ad09ac872e28ba6d597e58431e00140f728068316d6,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,0.009229421615600586,0.00987696647644043,0.009827613830566406,0.014378547668457031,0.009278059005737305,0.009392261505126953,0.009252309799194336,0.037497758865356445,0.0749821662902832,0.02507472038269043,0.25144338607788086,0.04012942314147949,0.04133272171020508,0.04010653495788574,0.04267382621765137,0.04229927062988281,0.039936065673828125,0.040718793869018555,0.04042935371398926,0.040255069732666016,0.040514230728149414,0.039931535720825195,0.04123520851135254,0.07211875915527344,0.0938715934753418,0.054653167724609375,0.28832054138183594,0.04050946235656738,0.040682077407836914,0.04022622108459473,0.040598392486572266,0.039427995681762695 diff --git a/results/combined/merges_timed/spigotmc/bungeecord.csv b/results/combined/merges_timed/spigotmc/bungeecord.csv index 953edc1bdc..1f28c793a4 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -381,refs/remotes/origin/pull/3371,f61fa56a8a1ea5e8f471014a614f6aff85198900,75aa9eb93c3fa63038e33b682bdd1d19e22c26d9,ca8f31bdc70a2ec626274b4659b99732ec602969,,True,True,Tests_passed,6ee17908cc61bda9bf0adfe3de861b1369efb1e7824d41ac411dcf3f29aa3d11,True,68,152,4969,2,True,Tests_passed,96ffe75b7be6e3a284eec92a9e9288490db32a692ac0aa87c8a6204995bee633,True,68,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,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Merge_timedout,,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,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,60e419661286efc457ca7947285f961f76522fa30d76324c8ac6d6487a5124ac,Merge_timedout,,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,0.03581833839416504,0.04290032386779785,0.057970523834228516,0.060427188873291016,0.05745649337768555,0.057672739028930664,0.057851314544677734,0.08434247970581055,0.10061240196228027,1.0959999561309814,-1.0,0.09158945083618164,0.13826775550842285,0.10336589813232422,0.11921024322509766,0.12089061737060547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +381,refs/remotes/origin/pull/3371,f61fa56a8a1ea5e8f471014a614f6aff85198900,75aa9eb93c3fa63038e33b682bdd1d19e22c26d9,ca8f31bdc70a2ec626274b4659b99732ec602969,,True,True,Tests_passed,6ee17908cc61bda9bf0adfe3de861b1369efb1e7824d41ac411dcf3f29aa3d11,True,68,152,4969,2,True,Tests_passed,96ffe75b7be6e3a284eec92a9e9288490db32a692ac0aa87c8a6204995bee633,True,68,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,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Merge_timedout,,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,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,60e419661286efc457ca7947285f961f76522fa30d76324c8ac6d6487a5124ac,Merge_timedout,,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,0.03581833839416504,0.04290032386779785,0.057970523834228516,0.060427188873291016,0.05745649337768555,0.057672739028930664,0.057851314544677734,0.08434247970581055,0.10061240196228027,1.0959999561309814,-1.0,0.09158945083618164,0.13826775550842285,0.10336589813232422,0.11921024322509766,0.12089061737060547,0.12746262550354004,0.1283097267150879,0.11887907981872559,0.12186241149902344,0.12772011756896973,0.12618160247802734,0.14651036262512207,0.1712179183959961,0.1559438705444336,1.1963558197021484,-1.0,0.10780096054077148,0.11043882369995117,0.11099052429199219,0.11665821075439453,0.11302328109741211 diff --git a/results/combined/merges_timed/spinscale/dropwizard-jobs.csv b/results/combined/merges_timed/spinscale/dropwizard-jobs.csv index 73b6dc6316..ce98e9a8de 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,True,14,49,233,2,True,14,Tests_passed,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,True,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,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,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,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,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,efcbc32751a649a2fc38a9ae286f24568f062ece9628034ce806479cdfe70528,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,0.033475399017333984,0.014754056930541992,0.04237985610961914,0.016756296157836914,0.04627275466918945,0.04199671745300293,0.04508495330810547,0.16614246368408203,0.11492800712585449,0.974041223526001,0.41315746307373047,0.0340275764465332,0.0594325065612793,0.03417849540710449,0.057869911193847656,0.05901026725769043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,True,14,49,233,2,True,14,Tests_passed,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,True,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,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,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,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,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,efcbc32751a649a2fc38a9ae286f24568f062ece9628034ce806479cdfe70528,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,0.033475399017333984,0.014754056930541992,0.04237985610961914,0.016756296157836914,0.04627275466918945,0.04199671745300293,0.04508495330810547,0.16614246368408203,0.11492800712585449,0.974041223526001,0.41315746307373047,0.0340275764465332,0.0594325065612793,0.03417849540710449,0.057869911193847656,0.05901026725769043,0.05525636672973633,0.05713057518005371,0.05686378479003906,0.05571174621582031,0.0573883056640625,0.0590672492980957,0.05769658088684082,0.0898442268371582,0.08773112297058105,0.9537289142608643,0.44177818298339844,0.05581164360046387,0.054833173751831055,0.055104732513427734,0.05547904968261719,0.05496716499328613 diff --git a/results/combined/merges_timed/splunk/splunk-library-javalogging.csv b/results/combined/merges_timed/splunk/splunk-library-javalogging.csv index 395ef19595..b759e5387a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,True,True,True,19.0,129,739.0,4,True,19,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,True,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,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,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,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,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,8eb25a095a48d6f13485f97387fa5a32689c9714d8a690fa701a063ae2a24b3e,Tests_failed,b230e70f7c8c3ed6b88e555b53e4538b798e61ace0d7251eb7a08578f329f6aa,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,0.012869119644165039,0.01305532455444336,0.014390230178833008,0.02107858657836914,0.014300823211669922,0.01484823226928711,0.015042781829833984,0.06598687171936035,0.1744081974029541,2.417557954788208,0.6770827770233154,0.041553497314453125,0.10471129417419434,0.0420987606048584,0.1079399585723877,0.10563993453979492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,True,True,True,19.0,129,739.0,4,True,19,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,True,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,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,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,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,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,8eb25a095a48d6f13485f97387fa5a32689c9714d8a690fa701a063ae2a24b3e,Tests_failed,b230e70f7c8c3ed6b88e555b53e4538b798e61ace0d7251eb7a08578f329f6aa,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,0.012869119644165039,0.01305532455444336,0.014390230178833008,0.02107858657836914,0.014300823211669922,0.01484823226928711,0.015042781829833984,0.06598687171936035,0.1744081974029541,2.417557954788208,0.6770827770233154,0.041553497314453125,0.10471129417419434,0.0420987606048584,0.1079399585723877,0.10563993453979492,0.10115957260131836,0.1019749641418457,0.1029512882232666,0.10155248641967773,0.10426044464111328,0.10533571243286133,0.1062014102935791,0.1768934726715088,0.1880486011505127,2.5824224948883057,0.7767529487609863,0.10285687446594238,0.10250067710876465,0.10248780250549316,0.10443758964538574,0.10154104232788086 diff --git a/results/combined/merges_timed/spotify/apollo.csv b/results/combined/merges_timed/spotify/apollo.csv index 634a0ee618..94ff1b65d2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,True,240,348,6860,4,True,240,Tests_passed,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,True,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,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,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,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,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,39b53d96841f6169aefab5bbc758a777d1a228b942e6ebf9614fd5a7a28b8987,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.04154491424560547,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.2470555305480957,1.6079597473144531,1.6141736507415771,0.07149672508239746,0.13675165176391602,0.06697249412536621,0.12918448448181152,0.13868451118469238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,True,240,348,6860,4,True,240,Tests_passed,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,True,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,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,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,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,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,39b53d96841f6169aefab5bbc758a777d1a228b942e6ebf9614fd5a7a28b8987,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.04154491424560547,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.2470555305480957,1.6079597473144531,1.6141736507415771,0.07149672508239746,0.13675165176391602,0.06697249412536621,0.12918448448181152,0.13868451118469238,0.12351727485656738,0.12475848197937012,0.1293647289276123,0.13066792488098145,0.12777233123779297,0.13051700592041016,0.12795591354370117,0.20491862297058105,0.206925630569458,1.7332642078399658,1.569324016571045,0.12854385375976562,0.12901568412780762,0.12690258026123047,0.126267671585083,0.13043665885925293 diff --git a/results/combined/merges_timed/spotify/dockerfile-maven.csv b/results/combined/merges_timed/spotify/dockerfile-maven.csv index ad874e3220..9ad1e431fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,False,True,8,14,117,2,True,8,Tests_passed,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,True,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,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_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,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_failed,cfb90beeb91a8a48e8a19439602447e457411c7e6dede0b1cba2e2dee3f99dd6,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.01805257797241211,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.1180882453918457,0.7774229049682617,0.2745676040649414,0.03424382209777832,0.059539079666137695,0.03445863723754883,0.057842254638671875,0.059606313705444336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,False,True,8,14,117,2,True,8,Tests_passed,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,True,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,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_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,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_failed,cfb90beeb91a8a48e8a19439602447e457411c7e6dede0b1cba2e2dee3f99dd6,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.01805257797241211,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.1180882453918457,0.7774229049682617,0.2745676040649414,0.03424382209777832,0.059539079666137695,0.03445863723754883,0.057842254638671875,0.059606313705444336,0.05434727668762207,0.05616044998168945,0.055191755294799805,0.059033870697021484,0.05544900894165039,0.05674433708190918,0.056725502014160156,0.09079980850219727,0.08905792236328125,0.7585322856903076,0.30309176445007324,0.05689549446105957,0.05832028388977051,0.05593395233154297,0.05492711067199707,0.05709528923034668 diff --git a/results/combined/merges_timed/spotify/elasticsearch-index-window.csv b/results/combined/merges_timed/spotify/elasticsearch-index-window.csv index c04dbcf5ff..6b8cb18732 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,True,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,True,3,14,68,2,True,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,True,3,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,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,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,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,0.04086041450500488,0.04193449020385742,0.04231548309326172,0.014088153839111328,0.03837394714355469,0.009404897689819336,0.042809247970581055,0.15707612037658691,0.11060738563537598,0.9588029384613037,0.29221153259277344,0.02942061424255371,0.051601409912109375,0.02944636344909668,0.052347660064697266,0.05309414863586426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,True,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,True,3,14,68,2,True,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,True,3,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,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,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,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,0.04086041450500488,0.04193449020385742,0.04231548309326172,0.014088153839111328,0.03837394714355469,0.009404897689819336,0.042809247970581055,0.15707612037658691,0.11060738563537598,0.9588029384613037,0.29221153259277344,0.02942061424255371,0.051601409912109375,0.02944636344909668,0.052347660064697266,0.05309414863586426,0.05429649353027344,0.05466890335083008,0.052468061447143555,0.05456376075744629,0.0539090633392334,0.052579402923583984,0.05351710319519043,0.08488202095031738,0.08371543884277344,1.1108086109161377,0.33799219131469727,0.05427837371826172,0.052675724029541016,0.05135345458984375,0.05148720741271973,0.05284929275512695 diff --git a/results/combined/merges_timed/spotify/ffwd-java.csv b/results/combined/merges_timed/spotify/ffwd-java.csv index 4af5b868ec..903b3e4d0c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,True,38,104,821,9,True,38,Tests_passed,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,True,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,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,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,bb55baa1e06cb1dded5ab460a8d8d633867e7215c83b3890fd54af2d89f241bc,Tests_failed,3d15e3e476671f01031c993e52bc80127ddb08bd537b215391c431bab3de1e89,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,0.02539658546447754,0.026096343994140625,0.03353595733642578,0.039887189865112305,0.033627986907958984,0.033824920654296875,0.033248186111450195,0.12299156188964844,0.44967007637023926,4.795285940170288,0.5005240440368652,0.03544282913208008,0.2448587417602539,0.06838202476501465,0.19791603088378906,0.2463817596435547 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,True,38,104,821,9,True,38,Tests_passed,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,True,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,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,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,bb55baa1e06cb1dded5ab460a8d8d633867e7215c83b3890fd54af2d89f241bc,Tests_failed,3d15e3e476671f01031c993e52bc80127ddb08bd537b215391c431bab3de1e89,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,Tests_passed,71e42bf6f8b694847473880519db41284c68fd89016d35f142ce26b2483e91dc,0.02539658546447754,0.026096343994140625,0.03353595733642578,0.039887189865112305,0.033627986907958984,0.033824920654296875,0.033248186111450195,0.12299156188964844,0.44967007637023926,4.795285940170288,0.5005240440368652,0.03544282913208008,0.2448587417602539,0.06838202476501465,0.19791603088378906,0.2463817596435547,0.23537659645080566,0.24155831336975098,0.23854756355285645,0.20075511932373047,0.22442984580993652,0.25601673126220703,0.2435474395751953,0.3960552215576172,0.45038843154907227,5.051164150238037,0.5497548580169678,0.20610666275024414,0.23225617408752441,0.2053234577178955,0.24178647994995117,0.22943806648254395 diff --git a/results/combined/merges_timed/spotify/hdfs2cass.csv b/results/combined/merges_timed/spotify/hdfs2cass.csv index 55e4e2f3c7..9fd4064a16 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,True,11,48,214,3,True,12,Tests_passed,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,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,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,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,54138c9eee5969b096816a75a5349b926af322bfd5e3238e3bee25b889c7f995,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,0.04835939407348633,0.05001544952392578,0.04179024696350098,0.01798534393310547,0.047612905502319336,0.04718732833862305,0.0493931770324707,0.1671743392944336,0.10576581954956055,0.8120906352996826,0.5068802833557129,0.03437519073486328,0.05834317207336426,0.03311491012573242,0.0567018985748291,0.05831456184387207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,True,11,48,214,3,True,12,Tests_passed,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,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,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,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,54138c9eee5969b096816a75a5349b926af322bfd5e3238e3bee25b889c7f995,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,0.04835939407348633,0.05001544952392578,0.04179024696350098,0.01798534393310547,0.047612905502319336,0.04718732833862305,0.0493931770324707,0.1671743392944336,0.10576581954956055,0.8120906352996826,0.5068802833557129,0.03437519073486328,0.05834317207336426,0.03311491012573242,0.0567018985748291,0.05831456184387207,0.05380868911743164,0.05622601509094238,0.057908058166503906,0.05847048759460449,0.05702042579650879,0.05870938301086426,0.0559384822845459,0.08927726745605469,0.08774757385253906,0.9088549613952637,0.542914867401123,0.05297112464904785,0.056162118911743164,0.05464959144592285,0.05710411071777344,0.05683469772338867 diff --git a/results/combined/merges_timed/spotify/netty-zmtp.csv b/results/combined/merges_timed/spotify/netty-zmtp.csv index 963f304730..719e3c875d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,True,32,227,3832,13,True,32,Tests_passed,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,True,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,True,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,3c624374762e5c56605311228d7e31ccdbc83fcfdb1532c7f5cbe48dff4cc6d0,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,Merge_failed,406d8e0fb0979191b48c894b96a23237662192224b80e34213e619610cebae36,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,e95569eb6de999a0f4ad980b4301950d3c697899df076115b0631ec70ec3ad55,Merge_failed,f86fa64193d79a40aabca337edec8d108f774c4ca802e27ad4e326299a453829,Merge_failed,dbac5736bc453cf4e1b2cd4e93899cbc105413300e9e8f0f4564e71580153d44,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,0.055075645446777344,0.055922508239746094,0.0539703369140625,0.01978778839111328,0.04944968223571777,0.05825376510620117,0.055877685546875,0.8547348976135254,0.7348642349243164,6.995342254638672,0.9349479675292969,0.17289996147155762,0.17669200897216797,0.17607903480529785,0.21494174003601074,0.19234108924865723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,True,32,227,3832,13,True,32,Tests_passed,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,True,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,True,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,3c624374762e5c56605311228d7e31ccdbc83fcfdb1532c7f5cbe48dff4cc6d0,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,Merge_failed,406d8e0fb0979191b48c894b96a23237662192224b80e34213e619610cebae36,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,e95569eb6de999a0f4ad980b4301950d3c697899df076115b0631ec70ec3ad55,Merge_failed,f86fa64193d79a40aabca337edec8d108f774c4ca802e27ad4e326299a453829,Merge_failed,dbac5736bc453cf4e1b2cd4e93899cbc105413300e9e8f0f4564e71580153d44,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,0.055075645446777344,0.055922508239746094,0.0539703369140625,0.01978778839111328,0.04944968223571777,0.05825376510620117,0.055877685546875,0.8547348976135254,0.7348642349243164,6.995342254638672,0.9349479675292969,0.17289996147155762,0.17669200897216797,0.17607903480529785,0.21494174003601074,0.19234108924865723,0.20848917961120605,0.19626593589782715,0.203657865524292,0.1916360855102539,0.21583819389343262,0.21153783798217773,0.21277379989624023,0.4227793216705322,0.5344150066375732,7.3183581829071045,1.1363656520843506,0.20670032501220703,0.21036982536315918,0.20600461959838867,0.20676422119140625,0.18743181228637695 diff --git a/results/combined/merges_timed/spoutcraft/legacylauncher.csv b/results/combined/merges_timed/spoutcraft/legacylauncher.csv index a3c2de9594..b8fb2418d6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,75e5f920cfdd14b65def29aabf6fc7a981cfa82c,3957f69a5e30979056644a3ce9261ab03cd9e0ce,87a19ffce60d9f05c7a1206bbf107d1852fa952e,,True,True,Tests_passed,e67be0dbf2347f747f6e3c4c77eb2b8c8a8423dfe6d5b206825112abf7e57572,True,6,32,225,2,True,Tests_passed,6f31180c12066cd3265cb088b8f010141fa1d04929949fb2e07fd9cd6f0bc2ba,True,6,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,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,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,72cb8449ed28ad0930fe6469c96e9a325d987f386a2c4b04d73419e93634ad41,Tests_failed,1e28dfe3bb18bfff71c77da62cfdd28a3e2f50abbed39ed83fee32de4ed94f71,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,0.011612653732299805,0.012366056442260742,0.012682199478149414,0.020031452178955078,0.012772321701049805,0.012521982192993164,0.01270294189453125,0.03854084014892578,0.06647968292236328,1.4180631637573242,0.41522836685180664,0.038358211517333984,0.06296277046203613,0.038332223892211914,0.0630800724029541,0.06694865226745605 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,75e5f920cfdd14b65def29aabf6fc7a981cfa82c,3957f69a5e30979056644a3ce9261ab03cd9e0ce,87a19ffce60d9f05c7a1206bbf107d1852fa952e,,True,True,Tests_passed,e67be0dbf2347f747f6e3c4c77eb2b8c8a8423dfe6d5b206825112abf7e57572,True,6,32,225,2,True,Tests_passed,6f31180c12066cd3265cb088b8f010141fa1d04929949fb2e07fd9cd6f0bc2ba,True,6,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,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,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,72cb8449ed28ad0930fe6469c96e9a325d987f386a2c4b04d73419e93634ad41,Tests_failed,1e28dfe3bb18bfff71c77da62cfdd28a3e2f50abbed39ed83fee32de4ed94f71,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,0.011612653732299805,0.012366056442260742,0.012682199478149414,0.020031452178955078,0.012772321701049805,0.012521982192993164,0.01270294189453125,0.03854084014892578,0.06647968292236328,1.4180631637573242,0.41522836685180664,0.038358211517333984,0.06296277046203613,0.038332223892211914,0.0630800724029541,0.06694865226745605,0.06319141387939453,0.06530451774597168,0.06694769859313965,0.07012581825256348,0.06881093978881836,0.06948018074035645,0.06725692749023438,0.10067462921142578,0.09823250770568848,1.6648962497711182,0.4675934314727783,0.06614947319030762,0.06374692916870117,0.06595993041992188,0.06412720680236816,0.06654477119445801 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 1b860e2c9d..e1fecf7690 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,False,True,4,8,96.0,2,True,4,Tests_passed,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,True,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,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,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Merge_timedout,,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,2ef5620670e0acf787bbfb5097a49c4923916c75250a81533ea0ec5a1f7994d6,Merge_timedout,,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,0.06298828125,0.0325016975402832,0.043036699295043945,0.016003131866455078,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.08961963653564453,1.1124932765960693,-1.0,0.0572047233581543,0.08468198776245117,0.05579972267150879,0.08581781387329102,0.06190967559814453 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,False,True,4,8,96.0,2,True,4,Tests_passed,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,True,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,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,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Merge_timedout,,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,2ef5620670e0acf787bbfb5097a49c4923916c75250a81533ea0ec5a1f7994d6,Merge_timedout,,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,Tests_passed,35e62959632a3d4da2c377baa2ce7d77052eabfff612d162e60d980bf06953c4,0.06298828125,0.0325016975402832,0.043036699295043945,0.016003131866455078,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.08961963653564453,1.1124932765960693,-1.0,0.0572047233581543,0.08468198776245117,0.05579972267150879,0.08581781387329102,0.06190967559814453,0.07555389404296875,0.07818865776062012,0.08559775352478027,0.08546662330627441,0.08503556251525879,0.0823817253112793,0.08672928810119629,0.11906814575195312,0.11312127113342285,1.0934467315673828,-1.0,0.08092570304870605,0.08208298683166504,0.05851626396179199,0.07862162590026855,0.07761383056640625 diff --git a/results/combined/merges_timed/spring-projects/spring-guice.csv b/results/combined/merges_timed/spring-projects/spring-guice.csv index 0f707b3d6f..a2addf5374 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,True,True,Tests_passed,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,True,17,75,623,3,True,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,True,17,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,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,910a93c58b6f3d7f962cdff6cf78b3520d6ddebb8e30187a1105e800303d3a33,Merge_failed,528a249e90f65f6d7e10978121d63fb64c4eae98c7546e23b31b8971aa718fc3,Tests_failed,ac24f9ebfa6257a7f6e59fcd6c507de78d962a85813b450b030baa6e004c303c,Tests_failed,7e4b7d250818ce38d9a1775d2ea25997f7d1bf6cc91418011d837cea6bf4170d,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,0.043654680252075195,0.043051719665527344,0.04335427284240723,0.017187833786010742,0.04160284996032715,0.040316104888916016,0.04358720779418945,0.2241971492767334,0.15804648399353027,0.6402933597564697,0.32243824005126953,0.04122114181518555,0.06168341636657715,0.042572975158691406,0.06598091125488281,0.07639002799987793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,True,True,Tests_passed,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,True,17,75,623,3,True,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,True,17,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,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,910a93c58b6f3d7f962cdff6cf78b3520d6ddebb8e30187a1105e800303d3a33,Merge_failed,528a249e90f65f6d7e10978121d63fb64c4eae98c7546e23b31b8971aa718fc3,Tests_failed,ac24f9ebfa6257a7f6e59fcd6c507de78d962a85813b450b030baa6e004c303c,Tests_failed,7e4b7d250818ce38d9a1775d2ea25997f7d1bf6cc91418011d837cea6bf4170d,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Merge_failed,a50dea0e1132f227c468ff30482f67d42a31bfbb2493b5b57e32c1349eaa3946,Tests_passed,683a2bce552d4b7e0c1af2a4c0d29ed49a6b66809d18a4eaebf361404bb661a2,0.043654680252075195,0.043051719665527344,0.04335427284240723,0.017187833786010742,0.04160284996032715,0.040316104888916016,0.04358720779418945,0.2241971492767334,0.15804648399353027,0.6402933597564697,0.32243824005126953,0.04122114181518555,0.06168341636657715,0.042572975158691406,0.06598091125488281,0.07639002799987793,0.06574463844299316,0.07712841033935547,0.0652611255645752,0.07780885696411133,0.06464266777038574,0.06526327133178711,0.06673479080200195,0.11522960662841797,0.12897968292236328,0.7311387062072754,0.4406118392944336,0.06725955009460449,0.06642961502075195,0.06607174873352051,0.06611394882202148,0.07622051239013672 diff --git a/results/combined/merges_timed/sps/pushover4j.csv b/results/combined/merges_timed/sps/pushover4j.csv index 074cebb81e..8004978a97 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,True,11,50,472,3,True,11,Tests_passed,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,True,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Tests_failed,148074370ea7c0cb0c848de2c7a4c303cefe7f1baa29a8025fae8300d22226a5,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,fe4263253fea8f7c1fa9e8a98bede76c8f56003355557a66ecbd0412036aa472,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,23801c3852d91a703a57bdf16da65b8c0eaaca5db6a09c1f13d92d0d68909b21,Tests_failed,3c83cb0fef577907162cf0676110816573ebb79b3ade8d3663310459bfcd3165,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,0.0385127067565918,0.04065680503845215,0.03860592842102051,0.0134124755859375,0.040575265884399414,0.0397489070892334,0.036165475845336914,0.2198195457458496,0.15230512619018555,1.2205595970153809,0.31556034088134766,0.03945517539978027,0.06042957305908203,0.038954973220825195,0.06337356567382812,0.05745291709899902 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,True,11,50,472,3,True,11,Tests_passed,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,True,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Tests_failed,148074370ea7c0cb0c848de2c7a4c303cefe7f1baa29a8025fae8300d22226a5,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,fe4263253fea8f7c1fa9e8a98bede76c8f56003355557a66ecbd0412036aa472,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,23801c3852d91a703a57bdf16da65b8c0eaaca5db6a09c1f13d92d0d68909b21,Tests_failed,3c83cb0fef577907162cf0676110816573ebb79b3ade8d3663310459bfcd3165,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,0.0385127067565918,0.04065680503845215,0.03860592842102051,0.0134124755859375,0.040575265884399414,0.0397489070892334,0.036165475845336914,0.2198195457458496,0.15230512619018555,1.2205595970153809,0.31556034088134766,0.03945517539978027,0.06042957305908203,0.038954973220825195,0.06337356567382812,0.05745291709899902,0.05898237228393555,0.05638432502746582,0.058161258697509766,0.05606222152709961,0.057845354080200195,0.0587007999420166,0.05931496620178223,0.10733914375305176,0.12051939964294434,1.289689064025879,0.37709808349609375,0.060764312744140625,0.061780452728271484,0.06148505210876465,0.05900931358337402,0.0553128719329834 diff --git a/results/combined/merges_timed/spullara/cli-parser.csv b/results/combined/merges_timed/spullara/cli-parser.csv index 880b35e336..c19fb80360 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,True,True,True,5,9,42,2,True,5,Tests_passed,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,True,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,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,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,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,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,fd60ec3c186cd12d8bedf00b615e25d561deb6f349d1256bcf281c6aead218c0,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,0.04181480407714844,0.041767120361328125,0.042313575744628906,0.014655828475952148,0.04053926467895508,0.04519796371459961,0.04488730430603027,0.09242367744445801,0.10806798934936523,1.1725594997406006,0.3568100929260254,0.028226137161254883,0.05552792549133301,0.0294644832611084,0.05430746078491211,0.05721282958984375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,True,True,True,5,9,42,2,True,5,Tests_passed,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,True,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,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,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,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,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,fd60ec3c186cd12d8bedf00b615e25d561deb6f349d1256bcf281c6aead218c0,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,0.04181480407714844,0.041767120361328125,0.042313575744628906,0.014655828475952148,0.04053926467895508,0.04519796371459961,0.04488730430603027,0.09242367744445801,0.10806798934936523,1.1725594997406006,0.3568100929260254,0.028226137161254883,0.05552792549133301,0.0294644832611084,0.05430746078491211,0.05721282958984375,0.052626609802246094,0.05411243438720703,0.052826642990112305,0.052641868591308594,0.052289724349975586,0.053342580795288086,0.0539705753326416,0.08432507514953613,0.08060765266418457,1.2360916137695312,0.3789546489715576,0.05311298370361328,0.05491065979003906,0.05437064170837402,0.054656267166137695,0.0549008846282959 diff --git a/results/combined/merges_timed/spullara/java-future-jdk8.csv b/results/combined/merges_timed/spullara/java-future-jdk8.csv index a0bd6c4b50..b0d710ef3d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,True,False,True,5,31,79,3,True,5,Tests_passed,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,True,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,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,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,492f16c3fdf8e8feeca2f7126c6334c90fd2ab900d166f931ac072d9f751675b,Tests_passed,3713211f7fb3a5cc2e2a7dcb0a8ca892db2278a426e2e7600bfa90df38b29dc6,Tests_passed,1fde98d1b0d39a5775551d780ce846c17115641350a2f87e02fe9c89cab2ff04,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,0.027054548263549805,0.027018070220947266,0.014333248138427734,0.012290477752685547,0.026129484176635742,0.01507711410522461,0.020133018493652344,0.14643168449401855,0.15822410583496094,1.1099374294281006,0.3479275703430176,0.037731170654296875,0.058518409729003906,0.03874492645263672,0.05960822105407715,0.05918121337890625 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,True,False,True,5,31,79,3,True,5,Tests_passed,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,True,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,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,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,492f16c3fdf8e8feeca2f7126c6334c90fd2ab900d166f931ac072d9f751675b,Tests_passed,3713211f7fb3a5cc2e2a7dcb0a8ca892db2278a426e2e7600bfa90df38b29dc6,Tests_passed,1fde98d1b0d39a5775551d780ce846c17115641350a2f87e02fe9c89cab2ff04,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,0.027054548263549805,0.027018070220947266,0.014333248138427734,0.012290477752685547,0.026129484176635742,0.01507711410522461,0.020133018493652344,0.14643168449401855,0.15822410583496094,1.1099374294281006,0.3479275703430176,0.037731170654296875,0.058518409729003906,0.03874492645263672,0.05960822105407715,0.05918121337890625,0.054311275482177734,0.055048465728759766,0.05524325370788574,0.05426430702209473,0.055016279220581055,0.05482339859008789,0.05497026443481445,0.10159683227539062,0.12565255165100098,1.064579963684082,0.39516329765319824,0.05586743354797363,0.055516719818115234,0.05595874786376953,0.05490279197692871,0.05532026290893555 diff --git a/results/combined/merges_timed/square/burst.csv b/results/combined/merges_timed/square/burst.csv index 3add7fef31..5c57d2422d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,True,4,20,104,2,True,4,Tests_passed,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,True,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,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,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,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,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d86c38231d00a821106f96ee54feaf38d4d2b7abc31f8c19dd28e698b7312305,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,0.041535139083862305,0.043637990951538086,0.03125119209289551,0.013739347457885742,0.044558048248291016,0.04207468032836914,0.043247222900390625,0.16170740127563477,0.11283397674560547,0.5715217590332031,0.4767277240753174,0.03061842918395996,0.053824424743652344,0.029755115509033203,0.05249929428100586,0.05291152000427246 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,True,4,20,104,2,True,4,Tests_passed,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,True,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,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,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,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,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d86c38231d00a821106f96ee54feaf38d4d2b7abc31f8c19dd28e698b7312305,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,0.041535139083862305,0.043637990951538086,0.03125119209289551,0.013739347457885742,0.044558048248291016,0.04207468032836914,0.043247222900390625,0.16170740127563477,0.11283397674560547,0.5715217590332031,0.4767277240753174,0.03061842918395996,0.053824424743652344,0.029755115509033203,0.05249929428100586,0.05291152000427246,0.05284857749938965,0.05471491813659668,0.05392765998840332,0.05286383628845215,0.05189347267150879,0.05312800407409668,0.05299210548400879,0.08593392372131348,0.08660531044006348,0.7222106456756592,0.5667648315429688,0.05294084548950195,0.052124738693237305,0.05217742919921875,0.053937673568725586,0.05298948287963867 diff --git a/results/combined/merges_timed/square/javapoet.csv b/results/combined/merges_timed/square/javapoet.csv index 50567646ed..f90c890c72 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,True,True,True,18,47,301,2,True,18,Tests_passed,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,True,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,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,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Tests_failed,d29b22784a091481604a649cea14d1abb2f3d3b672719537f947f75d6da24865,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,7b521997aff7e8e3dfe07841b986ddbacec8c51101941edb0ce7d00c8ff7ef2d,Tests_failed,0b26efae5734b159ab85840f30fe0fdf7776ce95ae1e8acc2ed0efd10120774d,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.020114660263061523,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.11350131034851074,0.9764175415039062,0.6715469360351562,0.044538021087646484,0.06325435638427734,0.045940399169921875,0.06639647483825684,0.06392097473144531 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,True,True,True,18,47,301,2,True,18,Tests_passed,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,True,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,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,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Tests_failed,d29b22784a091481604a649cea14d1abb2f3d3b672719537f947f75d6da24865,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,7b521997aff7e8e3dfe07841b986ddbacec8c51101941edb0ce7d00c8ff7ef2d,Tests_failed,0b26efae5734b159ab85840f30fe0fdf7776ce95ae1e8acc2ed0efd10120774d,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,Tests_passed,9ade9be7211eb1994f0662a1c0d369ce0088e6b21f1b3fb7a127f49dcf871036,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.020114660263061523,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.11350131034851074,0.9764175415039062,0.6715469360351562,0.044538021087646484,0.06325435638427734,0.045940399169921875,0.06639647483825684,0.06392097473144531,0.06563925743103027,0.06460285186767578,0.06579804420471191,0.06541705131530762,0.062090396881103516,0.06613945960998535,0.06793522834777832,0.09768509864807129,0.10274410247802734,1.152489185333252,0.7729065418243408,0.06539773941040039,0.06359267234802246,0.06638836860656738,0.06471920013427734,0.06366324424743652 diff --git a/results/combined/merges_timed/srdc/ontmalizer.csv b/results/combined/merges_timed/srdc/ontmalizer.csv index 7881e8bd7c..7ad0b43b63 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,True,3,9,38,2,True,3,Tests_passed,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,True,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,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,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,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,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,c980b47a34c015a8afc36a809c57699cfa508a2323faa15e227f66f4b66f5f7b,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,0.041312456130981445,0.031078577041625977,0.04424786567687988,0.035627126693725586,0.03132009506225586,0.04942965507507324,0.03839278221130371,0.09991240501403809,0.10624837875366211,1.4558322429656982,0.47424960136413574,0.060224294662475586,0.08902168273925781,0.05839943885803223,0.08868145942687988,0.09020280838012695 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,True,3,9,38,2,True,3,Tests_passed,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,True,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,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,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,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,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,c980b47a34c015a8afc36a809c57699cfa508a2323faa15e227f66f4b66f5f7b,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,0.041312456130981445,0.031078577041625977,0.04424786567687988,0.035627126693725586,0.03132009506225586,0.04942965507507324,0.03839278221130371,0.09991240501403809,0.10624837875366211,1.4558322429656982,0.47424960136413574,0.060224294662475586,0.08902168273925781,0.05839943885803223,0.08868145942687988,0.09020280838012695,0.0854947566986084,0.08466506004333496,0.08737516403198242,0.08733415603637695,0.09071016311645508,0.09126543998718262,0.08362340927124023,0.1261739730834961,0.11772537231445312,1.3992893695831299,0.5102124214172363,0.08088278770446777,0.08478856086730957,0.0814216136932373,0.08588290214538574,0.08280396461486816 diff --git a/results/combined/merges_timed/srt/asterisk-java.csv b/results/combined/merges_timed/srt/asterisk-java.csv index b7866f197a..713edb2e96 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,True,True,Tests_passed,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,True,217.0,1043,12580,4,True,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,True,217,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,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,Merge_failed,51a29b64df620716c638be2c5ca7c022d4bb840aeb1188748fa649a96611f1af,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,0fdcff8ab3a2e4061843a07736a82a61f0cc7540fe1c429584318c61aec6b226,Merge_failed,700571d4ac57aa9de9c3743af7dfbb41395f320c55fc3fd745bb6f9cb3902c7e,Merge_failed,5042e3c36bbb05665abde0beaf9394995fc5fa298c3b5ee4e1fcc53dc1a936b1,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,0.025496482849121094,0.03514742851257324,0.027884483337402344,0.03730416297912598,0.027953624725341797,0.027448415756225586,0.04669499397277832,0.10853219032287598,0.19387555122375488,1.107546091079712,2.07549786567688,0.0901641845703125,0.10379314422607422,0.08375883102416992,0.10426807403564453,0.11455249786376953 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,True,True,Tests_passed,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,True,217.0,1043,12580,4,True,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,True,217,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,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,Merge_failed,51a29b64df620716c638be2c5ca7c022d4bb840aeb1188748fa649a96611f1af,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,0fdcff8ab3a2e4061843a07736a82a61f0cc7540fe1c429584318c61aec6b226,Merge_failed,700571d4ac57aa9de9c3743af7dfbb41395f320c55fc3fd745bb6f9cb3902c7e,Merge_failed,5042e3c36bbb05665abde0beaf9394995fc5fa298c3b5ee4e1fcc53dc1a936b1,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,fd151a960eeecf728cec107411e717dc28a6123fb1ae040e6f4e368541cd8201,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,0.025496482849121094,0.03514742851257324,0.027884483337402344,0.03730416297912598,0.027953624725341797,0.027448415756225586,0.04669499397277832,0.10853219032287598,0.19387555122375488,1.107546091079712,2.07549786567688,0.0901641845703125,0.10379314422607422,0.08375883102416992,0.10426807403564453,0.11455249786376953,0.1007084846496582,0.11102533340454102,0.1068565845489502,0.11522912979125977,0.10807228088378906,0.10318231582641602,0.10559630393981934,0.16945433616638184,0.18444108963012695,1.2557668685913086,2.209512233734131,0.09968733787536621,0.10117816925048828,0.10189676284790039,0.10188412666320801,0.11168956756591797 diff --git a/results/combined/merges_timed/sstrickx/yahoofinance-api.csv b/results/combined/merges_timed/sstrickx/yahoofinance-api.csv index 3a1e9b90f6..514278ab78 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,True,7,25,138,2,True,7,Tests_passed,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,True,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,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,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,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,4f440803421139f8b2feb38d86d429862403105070923b15a7e1cffa6f5f1169,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,0.04486656188964844,0.04787135124206543,0.04181408882141113,0.018733501434326172,0.04027986526489258,0.041587114334106445,0.051138877868652344,0.16675615310668945,0.08397936820983887,0.5200858116149902,0.3644723892211914,0.03553605079650879,0.05936026573181152,0.0358428955078125,0.05799150466918945,0.0592656135559082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,True,7,25,138,2,True,7,Tests_passed,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,True,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,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,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,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,4f440803421139f8b2feb38d86d429862403105070923b15a7e1cffa6f5f1169,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,0.04486656188964844,0.04787135124206543,0.04181408882141113,0.018733501434326172,0.04027986526489258,0.041587114334106445,0.051138877868652344,0.16675615310668945,0.08397936820983887,0.5200858116149902,0.3644723892211914,0.03553605079650879,0.05936026573181152,0.0358428955078125,0.05799150466918945,0.0592656135559082,0.05837583541870117,0.05742311477661133,0.06033897399902344,0.05990195274353027,0.06055259704589844,0.06031203269958496,0.05898427963256836,0.09386181831359863,0.09330630302429199,0.570990800857544,0.4203460216522217,0.058897972106933594,0.05907440185546875,0.05899667739868164,0.0594637393951416,0.059542179107666016 diff --git a/results/combined/merges_timed/stackforge/monasca-common.csv b/results/combined/merges_timed/stackforge/monasca-common.csv index 4b82ec8d94..84fac3c3c0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,True,8,33,94,2,True,8,Tests_passed,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,True,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,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,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,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,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,82813ee009ecc060f86f72dd8401ed32fdaca07f95e5c7e8414bc97e13213b4d,Tests_passed,ac153078bdf7bd967abfb85e9e40dcfd22e12898c1db4ab5a1e5fd1c2ac042f5,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,0.03691983222961426,0.03333091735839844,0.04592490196228027,0.02298736572265625,0.029520034790039062,0.025876760482788086,0.03501749038696289,0.1588304042816162,0.11148309707641602,0.7451493740081787,0.4383864402770996,0.04192519187927246,0.05755972862243652,0.042096853256225586,0.06526684761047363,0.06454944610595703 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,True,8,33,94,2,True,8,Tests_passed,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,True,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,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,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,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,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,82813ee009ecc060f86f72dd8401ed32fdaca07f95e5c7e8414bc97e13213b4d,Tests_passed,ac153078bdf7bd967abfb85e9e40dcfd22e12898c1db4ab5a1e5fd1c2ac042f5,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,0.03691983222961426,0.03333091735839844,0.04592490196228027,0.02298736572265625,0.029520034790039062,0.025876760482788086,0.03501749038696289,0.1588304042816162,0.11148309707641602,0.7451493740081787,0.4383864402770996,0.04192519187927246,0.05755972862243652,0.042096853256225586,0.06526684761047363,0.06454944610595703,0.06640744209289551,0.06635904312133789,0.06643986701965332,0.06858253479003906,0.058493614196777344,0.0682973861694336,0.06797242164611816,0.09170126914978027,0.10019254684448242,0.8918566703796387,0.5147254467010498,0.06509232521057129,0.06712794303894043,0.06529951095581055,0.06387686729431152,0.0660238265991211 diff --git a/results/combined/merges_timed/stapler/stapler.csv b/results/combined/merges_timed/stapler/stapler.csv index 5f1dd70a65..8ce5329c96 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,True,27,75,391.0,2,True,27,Tests_passed,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,True,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,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,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Merge_timedout,,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,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,ad41075682c0921079f6377f0d884d6344c52eb84a58be867aeb998e0cdd2397,Merge_timedout,,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,0.027306318283081055,0.028360843658447266,0.039819955825805664,0.0211942195892334,0.02395176887512207,0.045267581939697266,0.03314805030822754,0.16994190216064453,0.08597636222839355,0.6681013107299805,-1.0,0.04216313362121582,0.06689095497131348,0.07130575180053711,0.06688380241394043,0.06713438034057617 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,True,27,75,391.0,2,True,27,Tests_passed,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,True,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,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,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Merge_timedout,,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,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,ad41075682c0921079f6377f0d884d6344c52eb84a58be867aeb998e0cdd2397,Merge_timedout,,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,0.027306318283081055,0.028360843658447266,0.039819955825805664,0.0211942195892334,0.02395176887512207,0.045267581939697266,0.03314805030822754,0.16994190216064453,0.08597636222839355,0.6681013107299805,-1.0,0.04216313362121582,0.06689095497131348,0.07130575180053711,0.06688380241394043,0.06713438034057617,0.06493115425109863,0.06540131568908691,0.06658244132995605,0.1046903133392334,0.06418275833129883,0.062070608139038086,0.09610676765441895,0.09815669059753418,0.09543967247009277,0.7104804515838623,-1.0,0.08206987380981445,0.06490063667297363,0.06561803817749023,0.06203722953796387,0.06230783462524414 diff --git a/results/combined/merges_timed/statefulj/statefulj.csv b/results/combined/merges_timed/statefulj/statefulj.csv index 259ac604bd..8ea4409ebb 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,False,True,3,5,37,2,True,3,Tests_passed,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,True,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,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,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,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,65a97fe787775d0425ab8d74b2fbdf5ca6a800c0df60b7d789837cb2ce318fea,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,0.03967857360839844,0.04439973831176758,0.04187130928039551,0.01644158363342285,0.042815446853637695,0.03521609306335449,0.04176783561706543,0.17615175247192383,0.11277389526367188,0.6611871719360352,0.2931530475616455,0.043285369873046875,0.0571599006652832,0.04383540153503418,0.06793856620788574,0.06886529922485352 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,False,True,3,5,37,2,True,3,Tests_passed,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,True,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,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,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,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,65a97fe787775d0425ab8d74b2fbdf5ca6a800c0df60b7d789837cb2ce318fea,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,0.03967857360839844,0.04439973831176758,0.04187130928039551,0.01644158363342285,0.042815446853637695,0.03521609306335449,0.04176783561706543,0.17615175247192383,0.11277389526367188,0.6611871719360352,0.2931530475616455,0.043285369873046875,0.0571599006652832,0.04383540153503418,0.06793856620788574,0.06886529922485352,0.06929183006286621,0.06836557388305664,0.06991243362426758,0.0719306468963623,0.07168436050415039,0.0654456615447998,0.07057499885559082,0.09122586250305176,0.10359930992126465,0.7931761741638184,0.35306406021118164,0.05604434013366699,0.06790709495544434,0.05731034278869629,0.06717109680175781,0.05773115158081055 diff --git a/results/combined/merges_timed/stealthly/xml-avro.csv b/results/combined/merges_timed/stealthly/xml-avro.csv index c3ce8bb6d5..3468442502 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,True,True,Tests_passed,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,True,7,14,151,4,True,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,True,7,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,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,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,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,0c1686bfd91e28813d5fd5d221ec0c98d61b34479c983a8b4147ad939cd4d61c,Tests_failed,af656b417b5d93e33615644ec48f65a2b6b165d215c11552157663d2f6f2c340,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,0.04396247863769531,0.04432868957519531,0.04644346237182617,0.0162811279296875,0.04962754249572754,0.05124497413635254,0.050194740295410156,0.2955362796783447,0.22114086151123047,2.000974655151367,0.3687727451324463,0.03163409233093262,0.09430527687072754,0.03202319145202637,0.09354114532470703,0.09547019004821777 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,True,True,Tests_passed,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,True,7,14,151,4,True,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,True,7,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,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,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,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,0c1686bfd91e28813d5fd5d221ec0c98d61b34479c983a8b4147ad939cd4d61c,Tests_failed,af656b417b5d93e33615644ec48f65a2b6b165d215c11552157663d2f6f2c340,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,0.04396247863769531,0.04432868957519531,0.04644346237182617,0.0162811279296875,0.04962754249572754,0.05124497413635254,0.050194740295410156,0.2955362796783447,0.22114086151123047,2.000974655151367,0.3687727451324463,0.03163409233093262,0.09430527687072754,0.03202319145202637,0.09354114532470703,0.09547019004821777,0.09442400932312012,0.09541511535644531,0.09403228759765625,0.09459114074707031,0.09351921081542969,0.09493851661682129,0.09462881088256836,0.16170525550842285,0.17637181282043457,2.337782859802246,0.4296412467956543,0.0967855453491211,0.09326457977294922,0.09410262107849121,0.0941002368927002,0.09539532661437988 diff --git a/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv b/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv index 944c5a3ee7..752c0ef986 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,True,61,236,1808,3,True,61,Tests_passed,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,True,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,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,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Tests_failed,3289f320d7fa69a2f3c161d0f59485dc6f8d04e55dc1ad60fc790b880c906df3,Merge_failed,edf897981c29e0ef1b6c541b5c133c81aa380f0dc4991c8392314f9e9f8f3df3,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,fd997b93751a603da443800a56cbe7f0e4a46ab59d7ea6ef9402145382ccae70,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,e191b444840f877395267b23d62a418d7f98275c19c4bb3e4af6286589fa5da6,Tests_failed,b6825545db0ce1c705cf236a598435e027672686a5ede06465be0fbb2f999a6b,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,0.022198200225830078,0.021750926971435547,0.023116111755371094,0.032863616943359375,0.024184703826904297,0.02344965934753418,0.023403406143188477,0.07099533081054688,0.14589500427246094,1.235701084136963,0.9158604145050049,0.07766127586364746,0.07321476936340332,0.07458996772766113,0.06273269653320312,0.06483674049377441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,True,61,236,1808,3,True,61,Tests_passed,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,True,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,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,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Tests_failed,3289f320d7fa69a2f3c161d0f59485dc6f8d04e55dc1ad60fc790b880c906df3,Merge_failed,edf897981c29e0ef1b6c541b5c133c81aa380f0dc4991c8392314f9e9f8f3df3,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,fd997b93751a603da443800a56cbe7f0e4a46ab59d7ea6ef9402145382ccae70,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,e191b444840f877395267b23d62a418d7f98275c19c4bb3e4af6286589fa5da6,Tests_failed,b6825545db0ce1c705cf236a598435e027672686a5ede06465be0fbb2f999a6b,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,0.022198200225830078,0.021750926971435547,0.023116111755371094,0.032863616943359375,0.024184703826904297,0.02344965934753418,0.023403406143188477,0.07099533081054688,0.14589500427246094,1.235701084136963,0.9158604145050049,0.07766127586364746,0.07321476936340332,0.07458996772766113,0.06273269653320312,0.06483674049377441,0.061704158782958984,0.06020188331604004,0.07203912734985352,0.07313156127929688,0.07212328910827637,0.060652971267700195,0.06079602241516113,0.1107177734375,0.12965083122253418,1.2740845680236816,1.0021295547485352,0.06075906753540039,0.06023764610290527,0.058765411376953125,0.07102155685424805,0.07285451889038086 diff --git a/results/combined/merges_timed/stephenc/high-scale-lib.csv b/results/combined/merges_timed/stephenc/high-scale-lib.csv index 6600a624e1..e48d1c91b7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,True,True,True,30,65,696,206,True,230,Tests_passed,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,True,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,True,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,ddc604ba3d70cd1dadf956a0b6c0e32ae41d17776553654d45fec9bc32164e40,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,c010001e7ba8ead019a323674a8486ee3cf27b78eaee8e7b500137a2b6c86597,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,56fa4711ac756afa44154cffa884adc906068f40c5055da418efe256caa4ff9f,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,0.049782752990722656,0.047698974609375,0.0700535774230957,0.037039995193481445,0.06251645088195801,0.0416109561920166,0.053411006927490234,0.796644926071167,0.45923352241516113,4.700870990753174,0.34354710578918457,0.13666105270385742,0.1085045337677002,0.14167380332946777,0.1064610481262207,0.10831952095031738 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,True,True,True,30,65,696,206,True,230,Tests_passed,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,True,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,True,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,ddc604ba3d70cd1dadf956a0b6c0e32ae41d17776553654d45fec9bc32164e40,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,c010001e7ba8ead019a323674a8486ee3cf27b78eaee8e7b500137a2b6c86597,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,56fa4711ac756afa44154cffa884adc906068f40c5055da418efe256caa4ff9f,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,0.049782752990722656,0.047698974609375,0.0700535774230957,0.037039995193481445,0.06251645088195801,0.0416109561920166,0.053411006927490234,0.796644926071167,0.45923352241516113,4.700870990753174,0.34354710578918457,0.13666105270385742,0.1085045337677002,0.14167380332946777,0.1064610481262207,0.10831952095031738,0.10646438598632812,0.10477972030639648,0.10862994194030762,0.10878562927246094,0.10863256454467773,0.10634160041809082,0.10945773124694824,0.290149450302124,0.28859591484069824,4.6626667976379395,0.4159684181213379,0.1066749095916748,0.10731124877929688,0.10718107223510742,0.10322046279907227,0.10514140129089355 diff --git a/results/combined/merges_timed/stephenc/java-iso-tools.csv b/results/combined/merges_timed/stephenc/java-iso-tools.csv index 0664d36082..db9866ea75 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,True,32,106,695,3,True,32,Tests_passed,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,True,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,53bfbbc1a8281f79c45aa95fa0ef41b1eeda6f533190d999077fc379ea181c22,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,bd7070f4d12820ebb1a4cc11603a68bf10bf3f83218134ab7598fd892d920213,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,0.053295135498046875,0.051064252853393555,0.04543638229370117,0.028893470764160156,0.026882410049438477,0.04539132118225098,0.028838634490966797,0.21299099922180176,0.16507482528686523,0.7602548599243164,0.5206778049468994,0.05083346366882324,0.06836652755737305,0.04444456100463867,0.06750988960266113,0.07338929176330566 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,True,32,106,695,3,True,32,Tests_passed,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,True,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,53bfbbc1a8281f79c45aa95fa0ef41b1eeda6f533190d999077fc379ea181c22,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,bd7070f4d12820ebb1a4cc11603a68bf10bf3f83218134ab7598fd892d920213,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,0.053295135498046875,0.051064252853393555,0.04543638229370117,0.028893470764160156,0.026882410049438477,0.04539132118225098,0.028838634490966797,0.21299099922180176,0.16507482528686523,0.7602548599243164,0.5206778049468994,0.05083346366882324,0.06836652755737305,0.04444456100463867,0.06750988960266113,0.07338929176330566,0.06768941879272461,0.06380128860473633,0.07755184173583984,0.07141637802124023,0.07832169532775879,0.07806229591369629,0.06806492805480957,0.11249208450317383,0.1316843032836914,0.7943580150604248,0.5969011783599854,0.07665610313415527,0.08047008514404297,0.0765085220336914,0.07543206214904785,0.0704038143157959 diff --git a/results/combined/merges_timed/steveice10/mcprotocollib.csv b/results/combined/merges_timed/steveice10/mcprotocollib.csv index 9ec0242d3d..5503d571ab 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -112,refs/heads/master,36e5eafd286fc1d6a554487a0a2e2f18032ece1a,f2b170bbca9eb8fed073b1c389d52ce2ca509f24,a9d83ee61b1a4ad48066c3ed4ceff0717eda6796,,True,True,True,46,228,4031,3,True,46,Tests_passed,105f29957a5295bf856c8ee07577efa08078758f39f0b341a03231d5f8efc83b,True,Tests_passed,a426c1f152032b27ed36222ecffe1c1c78a458cc3293cd720518a3a4c358a72e,True,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,49818883b8614ab42bfff5492a394cb2edcd91551f0d15d817f60fdb82f33364,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Tests_failed,5d8cd001c7a3ccbf657038fbdbcbb19f1a137b3d7e7ec0eaf2edd9029e75b361,Merge_failed,903e7f746f4e163157b471309a09b3df53b53e6d6b9e043950e6a1c4f75092f6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,23ac2dc7dce29b5d1452dc46799d1cbce5fbe49e244049113b929d8956c89015,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Tests_failed,253c4175a22facb7f18cce470001a1f81ba9a967465f56f805a1954bb5538f94,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,0.049477338790893555,0.04834914207458496,0.06033468246459961,0.02154064178466797,0.05930042266845703,0.05095171928405762,0.04589509963989258,0.22457575798034668,0.21477341651916504,4.416977643966675,1.4543735980987549,0.06855654716491699,0.06393885612487793,0.06304121017456055,0.07189011573791504,0.07134652137756348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +112,refs/heads/master,36e5eafd286fc1d6a554487a0a2e2f18032ece1a,f2b170bbca9eb8fed073b1c389d52ce2ca509f24,a9d83ee61b1a4ad48066c3ed4ceff0717eda6796,,True,True,True,46,228,4031,3,True,46,Tests_passed,105f29957a5295bf856c8ee07577efa08078758f39f0b341a03231d5f8efc83b,True,Tests_passed,a426c1f152032b27ed36222ecffe1c1c78a458cc3293cd720518a3a4c358a72e,True,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,49818883b8614ab42bfff5492a394cb2edcd91551f0d15d817f60fdb82f33364,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Tests_failed,5d8cd001c7a3ccbf657038fbdbcbb19f1a137b3d7e7ec0eaf2edd9029e75b361,Merge_failed,903e7f746f4e163157b471309a09b3df53b53e6d6b9e043950e6a1c4f75092f6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,23ac2dc7dce29b5d1452dc46799d1cbce5fbe49e244049113b929d8956c89015,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Tests_failed,253c4175a22facb7f18cce470001a1f81ba9a967465f56f805a1954bb5538f94,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,0.049477338790893555,0.04834914207458496,0.06033468246459961,0.02154064178466797,0.05930042266845703,0.05095171928405762,0.04589509963989258,0.22457575798034668,0.21477341651916504,4.416977643966675,1.4543735980987549,0.06855654716491699,0.06393885612487793,0.06304121017456055,0.07189011573791504,0.07134652137756348,0.08278465270996094,0.08065915107727051,0.08449792861938477,0.09325623512268066,0.09417128562927246,0.09217715263366699,0.07931947708129883,0.1355738639831543,0.1660308837890625,4.644345045089722,1.622985601425171,0.08156728744506836,0.08060956001281738,0.07916593551635742,0.08104515075683594,0.08659720420837402 diff --git a/results/combined/merges_timed/steveice10/packetlib.csv b/results/combined/merges_timed/steveice10/packetlib.csv index 6fcb6961c3..98fdeea1ca 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,True,True,Tests_passed,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,True,8,18,571,2,True,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,True,8,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,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Tests_failed,3bd1246f6b80fcf1cb7dbc845f6902e6ccf5d38702b9a516850bfcf53453a414,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,b126edcbf4ad25953371209539615f70b6e2c98cc787ba3f1717c6e99c74569f,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,3b10c419291c1f17b283fcce06b6775e05f402c3c35f77abef20be16469a5546,Tests_failed,7fd7f9cd7a2e6e4d5dedafdf0c4b99e4c3c381016e438cfe7949575762992ce1,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,0.04115581512451172,0.041048526763916016,0.04378795623779297,0.015516042709350586,0.04036664962768555,0.03858613967895508,0.041867971420288086,0.1680448055267334,0.12557005882263184,0.902921199798584,0.28936052322387695,0.04185318946838379,0.04508256912231445,0.044252872467041016,0.048328399658203125,0.04850196838378906 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,True,True,Tests_passed,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,True,8,18,571,2,True,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,True,8,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,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Tests_failed,3bd1246f6b80fcf1cb7dbc845f6902e6ccf5d38702b9a516850bfcf53453a414,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,b126edcbf4ad25953371209539615f70b6e2c98cc787ba3f1717c6e99c74569f,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,3b10c419291c1f17b283fcce06b6775e05f402c3c35f77abef20be16469a5546,Tests_failed,7fd7f9cd7a2e6e4d5dedafdf0c4b99e4c3c381016e438cfe7949575762992ce1,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,0.04115581512451172,0.041048526763916016,0.04378795623779297,0.015516042709350586,0.04036664962768555,0.03858613967895508,0.041867971420288086,0.1680448055267334,0.12557005882263184,0.902921199798584,0.28936052322387695,0.04185318946838379,0.04508256912231445,0.044252872467041016,0.048328399658203125,0.04850196838378906,0.04591822624206543,0.04694247245788574,0.04863238334655762,0.04746580123901367,0.04835844039916992,0.04706120491027832,0.04780268669128418,0.0819547176361084,0.0803384780883789,0.9928550720214844,0.3825187683105469,0.04702925682067871,0.045366525650024414,0.045537471771240234,0.04813647270202637,0.04784727096557617 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 82ea0d90e9..624ddb8876 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,True,24,126,788,3,True,24,Tests_passed,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,True,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,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,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Tests_failed,fc5fc2c2c1b15d8bd7d3a83d2070b89187d39587d707b06819a392851f7612a1,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,eda16c7d3ee0ad0f6a46898d52f0d902149b3e1932118e41a6e6a81f5a472571,Tests_passed,a71adcc899f6633681bd3d322229ef2e609da305586938846011f3bb4e0aa8fe,Tests_passed,6d4f881d974097ee049af445df66f0c0a3e22d5aa499edd05584e05691806ed8,Tests_failed,3a815e39e6fefcc2246e0f062351cede966ecf74114a2e07f36c3f5f581c61d6,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,0.015884876251220703,0.019470930099487305,0.017460346221923828,0.02969837188720703,0.017284393310546875,0.01746988296508789,0.017505884170532227,0.0643923282623291,0.1310744285583496,1.0309133529663086,0.564410924911499,0.056771039962768555,0.0774836540222168,0.05588722229003906,0.07875800132751465,0.10072779655456543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,True,24,126,788,3,True,24,Tests_passed,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,True,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,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,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Tests_failed,fc5fc2c2c1b15d8bd7d3a83d2070b89187d39587d707b06819a392851f7612a1,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,eda16c7d3ee0ad0f6a46898d52f0d902149b3e1932118e41a6e6a81f5a472571,Tests_passed,a71adcc899f6633681bd3d322229ef2e609da305586938846011f3bb4e0aa8fe,Tests_passed,6d4f881d974097ee049af445df66f0c0a3e22d5aa499edd05584e05691806ed8,Tests_failed,3a815e39e6fefcc2246e0f062351cede966ecf74114a2e07f36c3f5f581c61d6,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Merge_failed,4b98c0118117fd479d7f047358838ab08dc61a0d4dbc17c567c43be858b4cb1f,Tests_passed,42360072f164622d5815078fdbf1570973694a4cd5dfab194e9694f270db5528,0.015884876251220703,0.019470930099487305,0.017460346221923828,0.02969837188720703,0.017284393310546875,0.01746988296508789,0.017505884170532227,0.0643923282623291,0.1310744285583496,1.0309133529663086,0.564410924911499,0.056771039962768555,0.0774836540222168,0.05588722229003906,0.07875800132751465,0.10072779655456543,0.07765364646911621,0.10092687606811523,0.07865619659423828,0.1060171127319336,0.0811147689819336,0.08020639419555664,0.08148193359375,0.13649511337280273,0.16378355026245117,1.2569022178649902,0.6864731311798096,0.08090901374816895,0.07956671714782715,0.07773089408874512,0.0769491195678711,0.10143637657165527 diff --git a/results/combined/merges_timed/stoicflame/enunciate.csv b/results/combined/merges_timed/stoicflame/enunciate.csv index f6b64e76e6..9fc6f2ffed 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,True,9,18,1552.0,15,True,22,Tests_passed,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,True,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,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,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,5eb051a771dd202b158fcea971b5d8aa5a1e733cc06f3db7cfdff3449544d9a6,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Tests_passed,975197ed6cdfd1b18bbcc122fa8acd11364027677aece38413ff435e6d365f60,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,0.014941930770874023,0.05138897895812988,0.06596899032592773,0.023216962814331055,0.06143069267272949,0.05439281463623047,0.06634736061096191,0.2151203155517578,0.15001988410949707,0.7109589576721191,0.5283432006835938,0.051535606384277344,0.05181884765625,0.05225038528442383,0.05278325080871582,0.053046464920043945 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,True,9,18,1552.0,15,True,22,Tests_passed,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,True,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,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,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,5eb051a771dd202b158fcea971b5d8aa5a1e733cc06f3db7cfdff3449544d9a6,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Tests_passed,975197ed6cdfd1b18bbcc122fa8acd11364027677aece38413ff435e6d365f60,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,0.014941930770874023,0.05138897895812988,0.06596899032592773,0.023216962814331055,0.06143069267272949,0.05439281463623047,0.06634736061096191,0.2151203155517578,0.15001988410949707,0.7109589576721191,0.5283432006835938,0.051535606384277344,0.05181884765625,0.05225038528442383,0.05278325080871582,0.053046464920043945,0.04986715316772461,0.04942488670349121,0.05179142951965332,0.05219316482543945,0.05127096176147461,0.05126786231994629,0.050981998443603516,0.08751630783081055,0.09160923957824707,0.7457597255706787,0.5818257331848145,0.049623966217041016,0.05076026916503906,0.04986715316772461,0.05041193962097168,0.049124956130981445 diff --git a/results/combined/merges_timed/stratehm/stratum-proxy.csv b/results/combined/merges_timed/stratehm/stratum-proxy.csv index 0041cc2cac..b74e3cf85d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,True,True,Tests_passed,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,True,36,72,10240,2,True,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,True,36,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,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,8440aeaab4d49999a1c5cd2308a98fa62a09d0f5e7a62ecfe3f7bc06a85ec56f,Tests_failed,46bf38c71b40bfc2097fab6e0accd346132a4c8d09069fa897411642fb03ee04,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,0.01815199851989746,0.017971277236938477,0.019533872604370117,0.028659343719482422,0.020151615142822266,0.020522356033325195,0.020990371704101562,0.05327153205871582,0.07278561592102051,0.7091410160064697,0.6480007171630859,0.05596327781677246,0.08695840835571289,0.05677604675292969,0.08402228355407715,0.0856161117553711 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,True,True,Tests_passed,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,True,36,72,10240,2,True,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,True,36,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,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,8440aeaab4d49999a1c5cd2308a98fa62a09d0f5e7a62ecfe3f7bc06a85ec56f,Tests_failed,46bf38c71b40bfc2097fab6e0accd346132a4c8d09069fa897411642fb03ee04,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,Tests_passed,a62e926a8dd720280bd1ba6854be3b1c6b0725fe30243783d31202cd12156126,0.01815199851989746,0.017971277236938477,0.019533872604370117,0.028659343719482422,0.020151615142822266,0.020522356033325195,0.020990371704101562,0.05327153205871582,0.07278561592102051,0.7091410160064697,0.6480007171630859,0.05596327781677246,0.08695840835571289,0.05677604675292969,0.08402228355407715,0.0856161117553711,0.0838613510131836,0.08516907691955566,0.08543968200683594,0.08298158645629883,0.0856020450592041,0.08665990829467773,0.08748936653137207,0.12052249908447266,0.12061858177185059,0.7899107933044434,0.774327278137207,0.08444762229919434,0.08421826362609863,0.08338236808776855,0.08046889305114746,0.07694196701049805 diff --git a/results/combined/merges_timed/straup/dogeared-extruder.csv b/results/combined/merges_timed/straup/dogeared-extruder.csv index b8a3d3187b..614b71c97f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,Tests_passed,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,True,12,57,518,4,True,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,True,12,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,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,Merge_failed,6c42b150d68512ff63c3e1114c32caa64578d34599df1744ed965539b428e70a,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b0f6e70e9ae501fb7f611c478fbcb1b538f3ad63a880622b2e017d69bf57b2df,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,4d34e183e287f3530225062e2f6bca5d3c3164992ce454185719c24a0d508b26,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,0.03839230537414551,0.04458427429199219,0.03794717788696289,0.01475667953491211,0.04323983192443848,0.03570675849914551,0.038968563079833984,0.26676344871520996,0.17857813835144043,1.140211820602417,0.42096948623657227,0.06182217597961426,0.06072807312011719,0.058557987213134766,0.06164979934692383,0.06087636947631836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,Tests_passed,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,True,12,57,518,4,True,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,True,12,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,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,Merge_failed,6c42b150d68512ff63c3e1114c32caa64578d34599df1744ed965539b428e70a,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b0f6e70e9ae501fb7f611c478fbcb1b538f3ad63a880622b2e017d69bf57b2df,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,4d34e183e287f3530225062e2f6bca5d3c3164992ce454185719c24a0d508b26,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,0.03839230537414551,0.04458427429199219,0.03794717788696289,0.01475667953491211,0.04323983192443848,0.03570675849914551,0.038968563079833984,0.26676344871520996,0.17857813835144043,1.140211820602417,0.42096948623657227,0.06182217597961426,0.06072807312011719,0.058557987213134766,0.06164979934692383,0.06087636947631836,0.06209230422973633,0.06064772605895996,0.06185269355773926,0.06014609336853027,0.060903310775756836,0.05947256088256836,0.06097841262817383,0.12048721313476562,0.1252443790435791,1.3456039428710938,0.515242338180542,0.06173276901245117,0.06189727783203125,0.06119680404663086,0.061242103576660156,0.06200838088989258 diff --git a/results/combined/merges_timed/stripesframework/stripes.csv b/results/combined/merges_timed/stripesframework/stripes.csv index 0eba7a5b34..0f878df103 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,Tests_passed,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,True,32,60,395,2,True,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,True,32,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,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,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,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,b0ad32af7c86431e51abe42ce2815792f02015b3e88e2618e93bc03696516c52,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,0.0481874942779541,0.06094837188720703,0.04646611213684082,0.02473139762878418,0.061124563217163086,0.05701184272766113,0.049375057220458984,0.21686673164367676,0.11984658241271973,1.2847588062286377,0.7936115264892578,0.04607057571411133,0.07220172882080078,0.044832706451416016,0.07491922378540039,0.07238912582397461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,Tests_passed,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,True,32,60,395,2,True,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,True,32,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,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,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,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,b0ad32af7c86431e51abe42ce2815792f02015b3e88e2618e93bc03696516c52,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,0.0481874942779541,0.06094837188720703,0.04646611213684082,0.02473139762878418,0.061124563217163086,0.05701184272766113,0.049375057220458984,0.21686673164367676,0.11984658241271973,1.2847588062286377,0.7936115264892578,0.04607057571411133,0.07220172882080078,0.044832706451416016,0.07491922378540039,0.07238912582397461,0.0703132152557373,0.06874966621398926,0.07071208953857422,0.07411313056945801,0.07174277305603027,0.07382631301879883,0.06951236724853516,0.10885000228881836,0.10233855247497559,1.3521528244018555,0.7577493190765381,0.06845498085021973,0.06824421882629395,0.06898665428161621,0.06963253021240234,0.0687704086303711 diff --git a/results/combined/merges_timed/structr/structr.csv b/results/combined/merges_timed/structr/structr.csv index c8b54e8dca..c3e0142a3c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,True,81.0,565,3985.0,3,True,81,Tests_passed,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,True,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b96a7f4714620c597ff8526fd1678b04a8be2848681a632e221d889047c7af0e,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,10f1505c093da0f7af1baf31508e109476780e7be3bd7e80e9fd3c3433b145c7,Merge_failed,9fac9ecf73563cb516ffd468a4fc12364453c05e96a069c2da32577bc18baaad,Merge_failed,9fac9ecf73563cb516ffd468a4fc12364453c05e96a069c2da32577bc18baaad,Merge_failed,dbff070e944b51b2365aa6155aa5380c783b9ff81076d0c307cc2b0f36c3f141,Merge_failed,1be601a90add12d607d5564a3ada9775e7e285394f212addb8231d4081f1f555,Merge_failed,58803780afe4855215a9546cff8077f91880748ab591861189e67c74b34a0f81,Merge_failed,5a21b3507246213e707528cd493251fb89a49bf60d547ffba98e7174a6007544,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,0.043933868408203125,0.04338645935058594,0.04859471321105957,0.06279611587524414,0.04919576644897461,0.049001455307006836,0.04912376403808594,0.22030425071716309,0.16022300720214844,1.156846046447754,2.2860682010650635,0.09925293922424316,0.12502169609069824,0.10109925270080566,0.12627267837524414,0.12663722038269043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,True,81.0,565,3985.0,3,True,81,Tests_passed,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,True,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b96a7f4714620c597ff8526fd1678b04a8be2848681a632e221d889047c7af0e,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,10f1505c093da0f7af1baf31508e109476780e7be3bd7e80e9fd3c3433b145c7,Merge_failed,9fac9ecf73563cb516ffd468a4fc12364453c05e96a069c2da32577bc18baaad,Merge_failed,9fac9ecf73563cb516ffd468a4fc12364453c05e96a069c2da32577bc18baaad,Merge_failed,dbff070e944b51b2365aa6155aa5380c783b9ff81076d0c307cc2b0f36c3f141,Merge_failed,1be601a90add12d607d5564a3ada9775e7e285394f212addb8231d4081f1f555,Merge_failed,58803780afe4855215a9546cff8077f91880748ab591861189e67c74b34a0f81,Merge_failed,5a21b3507246213e707528cd493251fb89a49bf60d547ffba98e7174a6007544,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,dc1c9375885bf34b59c9211b3f7262ffc16c87fbb5862475cb8e7100329b7572,Merge_failed,e82a610ce037a8ff8b63fe9d21561b49139727f9f0724cd0d48d45cf48793159,0.043933868408203125,0.04338645935058594,0.04859471321105957,0.06279611587524414,0.04919576644897461,0.049001455307006836,0.04912376403808594,0.22030425071716309,0.16022300720214844,1.156846046447754,2.2860682010650635,0.09925293922424316,0.12502169609069824,0.10109925270080566,0.12627267837524414,0.12663722038269043,0.12472200393676758,0.11715555191040039,0.12740254402160645,0.12123942375183105,0.1308441162109375,0.1268010139465332,0.12880349159240723,0.19204306602478027,0.19833707809448242,1.2894117832183838,2.4381630420684814,0.1203310489654541,0.12134480476379395,0.1203620433807373,0.12322545051574707,0.11696314811706543 diff --git a/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv b/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv index d6d3d348c8..108c5a51c3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,True,True,Tests_passed,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,True,34,56,1363,5,True,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,True,34,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,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,Tests_passed,f69d5bd581689fef186529cec1a01b34b951e90fdb6fb6acdd979a3cbd5e1ada,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,7dceeff03b8b0359eb00f8471b1b60c521ec8f848060c28b239a9ed8604254be,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,b98f6847d9a84a5deeed0b34071e3c4bd389be0709bc81985ac5fe349bfceca3,Tests_failed,81ea57ec6b955e4884568edff115379efbbfdfa5102167705d25272eda6c8e86,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,0.04148530960083008,0.05640101432800293,0.044133663177490234,0.02134418487548828,0.05477643013000488,0.040110111236572266,0.044371843338012695,0.36508679389953613,0.27416110038757324,1.3286709785461426,0.3603942394256592,0.054795265197753906,0.10847115516662598,0.04885554313659668,0.11270570755004883,0.10997223854064941 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,True,True,Tests_passed,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,True,34,56,1363,5,True,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,True,34,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,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,Tests_passed,f69d5bd581689fef186529cec1a01b34b951e90fdb6fb6acdd979a3cbd5e1ada,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,7dceeff03b8b0359eb00f8471b1b60c521ec8f848060c28b239a9ed8604254be,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,b98f6847d9a84a5deeed0b34071e3c4bd389be0709bc81985ac5fe349bfceca3,Tests_failed,81ea57ec6b955e4884568edff115379efbbfdfa5102167705d25272eda6c8e86,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,0.04148530960083008,0.05640101432800293,0.044133663177490234,0.02134418487548828,0.05477643013000488,0.040110111236572266,0.044371843338012695,0.36508679389953613,0.27416110038757324,1.3286709785461426,0.3603942394256592,0.054795265197753906,0.10847115516662598,0.04885554313659668,0.11270570755004883,0.10997223854064941,0.11224508285522461,0.11001133918762207,0.11131453514099121,0.11104035377502441,0.10978531837463379,0.1102440357208252,0.11346697807312012,0.19131088256835938,0.21738100051879883,1.5405635833740234,0.4958512783050537,0.10987591743469238,0.1121370792388916,0.11400389671325684,0.11144828796386719,0.10932493209838867 diff --git a/results/combined/merges_timed/sviperll/static-mustache.csv b/results/combined/merges_timed/sviperll/static-mustache.csv index ac619552ca..a1849e5200 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,True,True,Tests_passed,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,True,41,188,1230,4,True,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,True,42,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,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Tests_failed,90d78b93ab6b6bf5957420760f252f6f6d0e30574eac9943535a1c2dac967e3d,Merge_failed,48070267b2659b874e01be9b7e8be24af9f8415a133f91783bf67f6385de7d7f,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,547ba7ec05a7661e972776396641dfb3d0436311abf0bb324d4bf81cc411b89a,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,44256c6c2aa349a1436ca5b0d6f50eefef45aafc9dc90cf4c1bc550149c8cfaf,Tests_failed,99a4e283bc2fbe89f1a60128297cc19164e18b9ceadd91069ae3cb14d0b54f23,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,0.010977506637573242,0.011341333389282227,0.011127948760986328,0.01840949058532715,0.01127004623413086,0.011226415634155273,0.01140594482421875,0.060337066650390625,0.17992687225341797,1.360405445098877,1.1422200202941895,0.059876203536987305,0.0796358585357666,0.0556485652923584,0.07791781425476074,0.07712960243225098 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,True,True,Tests_passed,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,True,41,188,1230,4,True,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,True,42,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,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Tests_failed,90d78b93ab6b6bf5957420760f252f6f6d0e30574eac9943535a1c2dac967e3d,Merge_failed,48070267b2659b874e01be9b7e8be24af9f8415a133f91783bf67f6385de7d7f,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,547ba7ec05a7661e972776396641dfb3d0436311abf0bb324d4bf81cc411b89a,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,44256c6c2aa349a1436ca5b0d6f50eefef45aafc9dc90cf4c1bc550149c8cfaf,Tests_failed,99a4e283bc2fbe89f1a60128297cc19164e18b9ceadd91069ae3cb14d0b54f23,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,0.010977506637573242,0.011341333389282227,0.011127948760986328,0.01840949058532715,0.01127004623413086,0.011226415634155273,0.01140594482421875,0.060337066650390625,0.17992687225341797,1.360405445098877,1.1422200202941895,0.059876203536987305,0.0796358585357666,0.0556485652923584,0.07791781425476074,0.07712960243225098,0.07820463180541992,0.07745957374572754,0.07885336875915527,0.07968640327453613,0.07720208168029785,0.07921552658081055,0.07844400405883789,0.14457345008850098,0.18878912925720215,1.6281630992889404,1.3275694847106934,0.07927083969116211,0.07690858840942383,0.0777580738067627,0.07773041725158691,0.0776834487915039 diff --git a/results/combined/merges_timed/swagger-api/swagger-codegen.csv b/results/combined/merges_timed/swagger-api/swagger-codegen.csv index a84f2b1ea6..f6daa69e67 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,True,1863,4437,124231.0,2,True,1863,Tests_passed,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,True,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,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,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,a77062019279b2d7e2f1b5722e81f807dc1f1e4a38780bd95c3c06e6815bf4d3,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,e1aef1bfd2c2d1acebbafcf5e081ee4e763ee15589d40d8d6c9632ff527df1a1,Tests_failed,2652f2408da07938da49a1ed8c3ca2fbdab8bb4fdfd871d9b6a44163d4564440,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.21100378036499023,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.17418527603149414,0.8080813884735107,9.106657981872559,0.24354243278503418,0.32351064682006836,0.24762344360351562,0.31154870986938477,0.3212003707885742 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,True,1863,4437,124231.0,2,True,1863,Tests_passed,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,True,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,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,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,a77062019279b2d7e2f1b5722e81f807dc1f1e4a38780bd95c3c06e6815bf4d3,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,e1aef1bfd2c2d1acebbafcf5e081ee4e763ee15589d40d8d6c9632ff527df1a1,Tests_failed,2652f2408da07938da49a1ed8c3ca2fbdab8bb4fdfd871d9b6a44163d4564440,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,Tests_passed,30a0f55feb78fb6985da4b95c4a751b089796e2acbed0601f3a71d11decd1db4,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.21100378036499023,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.17418527603149414,0.8080813884735107,9.106657981872559,0.24354243278503418,0.32351064682006836,0.24762344360351562,0.31154870986938477,0.3212003707885742,0.3054957389831543,0.3035886287689209,0.3921620845794678,0.39161252975463867,0.3990449905395508,0.39926576614379883,0.39417552947998047,0.4136834144592285,0.3564186096191406,1.0099210739135742,8.687218189239502,0.31226325035095215,0.30786919593811035,0.31307053565979004,0.29174017906188965,0.30400705337524414 diff --git a/results/combined/merges_timed/swagger-api/swagger-parser.csv b/results/combined/merges_timed/swagger-api/swagger-parser.csv index d38efbed1a..1f56ca6579 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,False,True,2.0,9,76.0,3,True,3,Tests_passed,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,True,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,True,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,7534add66c8c2ec798b9a78ef0db20a9cec3c251fa2e473c0532bda246a70567,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Tests_failed,325244ec0d1a0a11c79de33da0944bb197762d21f167265a6267d03b551132ee,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,68330b7e0e3bb478dfe18ac852dc8162c8321cbd56ba6c49b82ed269d05c0f55,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,0c6d8dd0540650b887be8febf96a7b44ce5161625abf5193fa84f5e060c859a9,Tests_failed,715716529d325780cf4703dcb0daa056ffdeee93c1604126c5da5b963f8713dd,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,0.037400245666503906,0.03524374961853027,0.01166081428527832,0.016748428344726562,0.045549869537353516,0.044206857681274414,0.04946446418762207,0.16750597953796387,0.11723852157592773,0.6091639995574951,0.9580173492431641,0.044440507888793945,0.046625375747680664,0.045589447021484375,0.05683755874633789,0.052701473236083984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,False,True,2.0,9,76.0,3,True,3,Tests_passed,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,True,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,True,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,7534add66c8c2ec798b9a78ef0db20a9cec3c251fa2e473c0532bda246a70567,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Tests_failed,325244ec0d1a0a11c79de33da0944bb197762d21f167265a6267d03b551132ee,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,68330b7e0e3bb478dfe18ac852dc8162c8321cbd56ba6c49b82ed269d05c0f55,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,0c6d8dd0540650b887be8febf96a7b44ce5161625abf5193fa84f5e060c859a9,Tests_failed,715716529d325780cf4703dcb0daa056ffdeee93c1604126c5da5b963f8713dd,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,0.037400245666503906,0.03524374961853027,0.01166081428527832,0.016748428344726562,0.045549869537353516,0.044206857681274414,0.04946446418762207,0.16750597953796387,0.11723852157592773,0.6091639995574951,0.9580173492431641,0.044440507888793945,0.046625375747680664,0.045589447021484375,0.05683755874633789,0.052701473236083984,0.05205035209655762,0.05367302894592285,0.05459022521972656,0.054907798767089844,0.054480552673339844,0.0559539794921875,0.05556440353393555,0.09518170356750488,0.09002995491027832,0.7232451438903809,1.1082932949066162,0.05437779426574707,0.056800127029418945,0.052590370178222656,0.051265716552734375,0.05285072326660156 diff --git a/results/combined/merges_timed/swagger-api/validator-badge.csv b/results/combined/merges_timed/swagger-api/validator-badge.csv index 45b2f5069f..a2017d9ba4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,True,True,True,9,69,1789,3,True,9,Tests_passed,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,True,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,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,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,3368569c3156faef67e6cf7ad6baedab5a8414cdacb710d5705e0ed6c8e17b78,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,1738f3bd8b9a9a48b31c41825c65f3abbe11d1cf41b252a417b602d5757815ea,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,c8b8039f1338c26588547e7b718420e011db1083f8f6771d3f51c8d41060779d,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,0.041629791259765625,0.041890621185302734,0.03996586799621582,0.013389825820922852,0.03858184814453125,0.04163169860839844,0.0398707389831543,0.23205065727233887,0.16985750198364258,1.3908233642578125,0.27697157859802246,0.05250215530395508,0.05364394187927246,0.05644512176513672,0.06197619438171387,0.052661895751953125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,True,True,True,9,69,1789,3,True,9,Tests_passed,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,True,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,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,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,3368569c3156faef67e6cf7ad6baedab5a8414cdacb710d5705e0ed6c8e17b78,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,1738f3bd8b9a9a48b31c41825c65f3abbe11d1cf41b252a417b602d5757815ea,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,c8b8039f1338c26588547e7b718420e011db1083f8f6771d3f51c8d41060779d,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,0.041629791259765625,0.041890621185302734,0.03996586799621582,0.013389825820922852,0.03858184814453125,0.04163169860839844,0.0398707389831543,0.23205065727233887,0.16985750198364258,1.3908233642578125,0.27697157859802246,0.05250215530395508,0.05364394187927246,0.05644512176513672,0.06197619438171387,0.052661895751953125,0.062027931213378906,0.05394268035888672,0.0635066032409668,0.05244135856628418,0.06708598136901855,0.0718681812286377,0.0685582160949707,0.1233518123626709,0.13650202751159668,1.600412368774414,0.35986876487731934,0.06321430206298828,0.061859130859375,0.06166481971740723,0.06125020980834961,0.05360770225524902 diff --git a/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv b/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv index 9d3ed6bb44..ecf0a3dc5a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,False,True,4,14,54,2,True,4,Tests_passed,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,True,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,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,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,debf8ee8171f300a5c4f101c62f865d802db44a2f66a3d0e0e3827086e81c571,Tests_failed,9dcfc4d550ce2ba2525c2cf549d40fb93dee42b1492176f020ca8d5597918736,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,0.06017804145812988,0.058310508728027344,0.09206104278564453,0.09275460243225098,0.08423614501953125,0.09364104270935059,0.0847787857055664,0.15560078620910645,0.11568212509155273,0.8433101177215576,0.44896697998046875,0.14754533767700195,0.16847920417785645,0.1455848217010498,0.1734626293182373,0.17258238792419434 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,False,True,4,14,54,2,True,4,Tests_passed,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,True,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,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,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,debf8ee8171f300a5c4f101c62f865d802db44a2f66a3d0e0e3827086e81c571,Tests_failed,9dcfc4d550ce2ba2525c2cf549d40fb93dee42b1492176f020ca8d5597918736,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,252cda9f2ae436151ef7cc24ffe80dc20cddad10a2372ed67f4645e3c507f7e9,Tests_passed,7276893e390dc94192afaa2497b1a63de064c35c88599e3d6da1d970c249e7a1,0.06017804145812988,0.058310508728027344,0.09206104278564453,0.09275460243225098,0.08423614501953125,0.09364104270935059,0.0847787857055664,0.15560078620910645,0.11568212509155273,0.8433101177215576,0.44896697998046875,0.14754533767700195,0.16847920417785645,0.1455848217010498,0.1734626293182373,0.17258238792419434,0.16836285591125488,0.16257429122924805,0.19838500022888184,0.19015049934387207,0.20839667320251465,0.2031111717224121,0.19405245780944824,0.2194979190826416,0.23529386520385742,1.0433814525604248,0.48446178436279297,0.1795215606689453,0.1751101016998291,0.18482160568237305,0.1688249111175537,0.17369818687438965 diff --git a/results/combined/merges_timed/synbiodex/libsbolj.csv b/results/combined/merges_timed/synbiodex/libsbolj.csv index 235297b02d..d1319b70fd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,Tests_passed,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,True,10,31,560.0,2,True,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,True,10,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,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,338ed68249ac5ae704c4a75d1b5f3fa8c768299bce5853a931429d6a665b294c,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,0.01741766929626465,0.018407106399536133,0.02079486846923828,0.0290830135345459,0.020008325576782227,0.02008986473083496,0.0201413631439209,0.05031847953796387,0.07264924049377441,3.177938938140869,2.0606720447540283,0.05485725402832031,0.10961461067199707,0.05415511131286621,0.10459303855895996,0.10283732414245605 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,Tests_passed,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,True,10,31,560.0,2,True,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,True,10,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,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,338ed68249ac5ae704c4a75d1b5f3fa8c768299bce5853a931429d6a665b294c,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,Tests_passed,d4d16699ae3f78c8e79da947c22a48dbd5e22d19182bd28ec58bf32262cb9133,0.01741766929626465,0.018407106399536133,0.02079486846923828,0.0290830135345459,0.020008325576782227,0.02008986473083496,0.0201413631439209,0.05031847953796387,0.07264924049377441,3.177938938140869,2.0606720447540283,0.05485725402832031,0.10961461067199707,0.05415511131286621,0.10459303855895996,0.10283732414245605,0.10213947296142578,0.1007699966430664,0.10389328002929688,0.1056053638458252,0.10024833679199219,0.10212874412536621,0.10417342185974121,0.14214539527893066,0.13997149467468262,3.314718246459961,2.1703004837036133,0.10256338119506836,0.10081291198730469,0.09974455833435059,0.10172295570373535,0.09962940216064453 diff --git a/results/combined/merges_timed/syncleus/ferma.csv b/results/combined/merges_timed/syncleus/ferma.csv index 28f3afe6bd..851a9ec96d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,True,52,193,647,3,True,52,Tests_passed,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,True,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,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,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,35ce135f42e25eaa4df56b4ffa526bac3f051744c9ece4cce8157c0234c982c7,Tests_failed,6019d8980636636328a7b54584f88fbd14cfcf207179e3ef63df1423d8fc19a4,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,0.06989574432373047,0.05419278144836426,0.0653538703918457,0.030837297439575195,0.07117772102355957,0.06744647026062012,0.06168699264526367,0.2442326545715332,0.18275737762451172,1.5998272895812988,0.9947972297668457,0.04926443099975586,0.09993362426757812,0.049390554428100586,0.10364580154418945,0.10200643539428711 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,True,52,193,647,3,True,52,Tests_passed,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,True,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,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,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,35ce135f42e25eaa4df56b4ffa526bac3f051744c9ece4cce8157c0234c982c7,Tests_failed,6019d8980636636328a7b54584f88fbd14cfcf207179e3ef63df1423d8fc19a4,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,Tests_passed,16b4c4f60a68e0edaaaee76cd3a04b4b9e9e56a1a172a32a2131b99cace6a7cc,0.06989574432373047,0.05419278144836426,0.0653538703918457,0.030837297439575195,0.07117772102355957,0.06744647026062012,0.06168699264526367,0.2442326545715332,0.18275737762451172,1.5998272895812988,0.9947972297668457,0.04926443099975586,0.09993362426757812,0.049390554428100586,0.10364580154418945,0.10200643539428711,0.10314178466796875,0.1024634838104248,0.10390830039978027,0.10614800453186035,0.10320854187011719,0.1069343090057373,0.10818195343017578,0.158768892288208,0.16184782981872559,1.7692232131958008,1.1309599876403809,0.10332083702087402,0.10462760925292969,0.09897875785827637,0.10078859329223633,0.10155296325683594 diff --git a/results/combined/merges_timed/synergian/wagon-git.csv b/results/combined/merges_timed/synergian/wagon-git.csv index 8e19156c82..baa0090c8d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,True,True,Tests_passed,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,True,2,1,2,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,True,3,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,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,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,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,8d3331003c7787b98159a425b16c36e0e50f923ace57c17b8437afe6e7719660,Tests_failed,7791bf6f06758daeabe6cc4971239961a2f0fe3e1225e45adb562b71a9efef62,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,0.04148244857788086,0.03937363624572754,0.04178261756896973,0.013495206832885742,0.040834903717041016,0.03988790512084961,0.03753018379211426,0.16123485565185547,0.09822225570678711,0.66471266746521,0.373431921005249,0.029062271118164062,0.05222129821777344,0.02894425392150879,0.05232548713684082,0.052365779876708984 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,True,True,Tests_passed,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,True,2,1,2,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,True,3,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,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,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,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,8d3331003c7787b98159a425b16c36e0e50f923ace57c17b8437afe6e7719660,Tests_failed,7791bf6f06758daeabe6cc4971239961a2f0fe3e1225e45adb562b71a9efef62,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,0.04148244857788086,0.03937363624572754,0.04178261756896973,0.013495206832885742,0.040834903717041016,0.03988790512084961,0.03753018379211426,0.16123485565185547,0.09822225570678711,0.66471266746521,0.373431921005249,0.029062271118164062,0.05222129821777344,0.02894425392150879,0.05232548713684082,0.052365779876708984,0.049878597259521484,0.050275564193725586,0.050760507583618164,0.050391197204589844,0.050827741622924805,0.05065274238586426,0.05151772499084473,0.08101630210876465,0.08077430725097656,0.6882977485656738,0.3973379135131836,0.05031943321228027,0.05015873908996582,0.05051708221435547,0.050220489501953125,0.04909801483154297 diff --git a/results/combined/merges_timed/t-oster/liblasercut.csv b/results/combined/merges_timed/t-oster/liblasercut.csv index a7d719d594..2e68204383 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,True,15,21,61,2,True,15,Tests_passed,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,True,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,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,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,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,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_failed,3a4f22292436732e8204674d7e23f27830c7d9e17d439c8934bcfb86a6e31690,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,0.04989457130432129,0.0581815242767334,0.05586695671081543,0.06063485145568848,0.0675802230834961,0.019044876098632812,0.019267559051513672,0.11400127410888672,0.09880208969116211,1.6819303035736084,0.6157791614532471,0.03508472442626953,0.1248788833618164,0.10531497001647949,0.08223533630371094,0.1287248134613037 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,True,15,21,61,2,True,15,Tests_passed,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,True,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,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,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,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,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_failed,3a4f22292436732e8204674d7e23f27830c7d9e17d439c8934bcfb86a6e31690,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,0.04989457130432129,0.0581815242767334,0.05586695671081543,0.06063485145568848,0.0675802230834961,0.019044876098632812,0.019267559051513672,0.11400127410888672,0.09880208969116211,1.6819303035736084,0.6157791614532471,0.03508472442626953,0.1248788833618164,0.10531497001647949,0.08223533630371094,0.1287248134613037,0.12206530570983887,0.12630057334899902,0.1315600872039795,0.1450037956237793,0.06578612327575684,0.13562631607055664,0.13572978973388672,0.0982820987701416,0.17018842697143555,1.673327922821045,0.6335563659667969,0.06519246101379395,0.12122726440429688,0.13025164604187012,0.06490039825439453,0.12048816680908203 diff --git a/results/combined/merges_timed/t0xa/gelfj.csv b/results/combined/merges_timed/t0xa/gelfj.csv index ae44aa8e08..f82e7a111b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,True,14,62,212,7,True,14,Tests_passed,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,True,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,True,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,10ad6a1bc4e4d5a52bcb0af16670de6c0f76e725b063edb9dd7e40478facbcbb,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Tests_failed,4b28297863cb136d94fe8fb8d33d259e9f365dbbd3fc8d830af3312729267224,Merge_failed,2c5b80f915472790cb3b77b8b2024899c15bd8b56707fbf71eedfd1815046dd8,Merge_failed,55ba35fb95a1d86f55e7b84b3da98387ac82ff294d33723a50c4c3c8d9e8ed67,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,751852b56c807a796d91e7c4d8015195daf8282963e1d43de441144ed2a1ba24,Merge_failed,0f6dc8a42d4dcf26a30b47ccdc34c8709f963aa6e8cf0488a2072d9d081120d5,Merge_failed,0f6dc8a42d4dcf26a30b47ccdc34c8709f963aa6e8cf0488a2072d9d081120d5,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,984cc7ecea554778f5cdfc5fec1642937aaccba74b36699b66b63004e93876ce,Merge_failed,9b3f2e96277dde968fb9faaac62cc77a27bc093146554a9d18aaba932ff5d5f8,Tests_failed,98c44bf7da0357cfb94f0007e6ab0460e742ec09e833877888463a647d3f50dd,Tests_failed,c23a5ba7337c6f952d3a906710253dfacf09fe287928d47524187f3ebf4c6c37,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,0.034657955169677734,0.04533243179321289,0.04227709770202637,0.014110803604125977,0.04363751411437988,0.03152346611022949,0.04490208625793457,0.49304723739624023,0.4368579387664795,3.882582426071167,0.5271866321563721,0.07522177696228027,0.11295437812805176,0.07818293571472168,0.12157273292541504,0.12117457389831543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,True,14,62,212,7,True,14,Tests_passed,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,True,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,True,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,10ad6a1bc4e4d5a52bcb0af16670de6c0f76e725b063edb9dd7e40478facbcbb,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Tests_failed,4b28297863cb136d94fe8fb8d33d259e9f365dbbd3fc8d830af3312729267224,Merge_failed,2c5b80f915472790cb3b77b8b2024899c15bd8b56707fbf71eedfd1815046dd8,Merge_failed,55ba35fb95a1d86f55e7b84b3da98387ac82ff294d33723a50c4c3c8d9e8ed67,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,751852b56c807a796d91e7c4d8015195daf8282963e1d43de441144ed2a1ba24,Merge_failed,0f6dc8a42d4dcf26a30b47ccdc34c8709f963aa6e8cf0488a2072d9d081120d5,Merge_failed,0f6dc8a42d4dcf26a30b47ccdc34c8709f963aa6e8cf0488a2072d9d081120d5,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,984cc7ecea554778f5cdfc5fec1642937aaccba74b36699b66b63004e93876ce,Merge_failed,9b3f2e96277dde968fb9faaac62cc77a27bc093146554a9d18aaba932ff5d5f8,Tests_failed,98c44bf7da0357cfb94f0007e6ab0460e742ec09e833877888463a647d3f50dd,Tests_failed,c23a5ba7337c6f952d3a906710253dfacf09fe287928d47524187f3ebf4c6c37,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,80737ddc5f0ea7191610e02d9faf1d37a5f7a3a2845843b99918f257556bc29f,Merge_failed,cbb1885533121a1d6da30239f9150619fd39cbc9a17af8ba93951a897daba202,0.034657955169677734,0.04533243179321289,0.04227709770202637,0.014110803604125977,0.04363751411437988,0.03152346611022949,0.04490208625793457,0.49304723739624023,0.4368579387664795,3.882582426071167,0.5271866321563721,0.07522177696228027,0.11295437812805176,0.07818293571472168,0.12157273292541504,0.12117457389831543,0.11864280700683594,0.11824488639831543,0.11611700057983398,0.11542916297912598,0.11594223976135254,0.1143958568572998,0.11678600311279297,0.22608017921447754,0.2824380397796631,4.040295362472534,0.6815552711486816,0.1182260513305664,0.1175377368927002,0.11632704734802246,0.11902999877929688,0.11704778671264648 diff --git a/results/combined/merges_timed/tabulapdf/tabula-java.csv b/results/combined/merges_timed/tabulapdf/tabula-java.csv index 04761516a8..27ec8d9b65 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -78,refs/remotes/origin/pull/217,03052f76c71af1b9b91e2c8023490c30456e2d45,5d90107c4a8a2c6a9bc2019dcfd3e119603fe6a0,1eafa3e2cda365e57967ca2b618b6b5aa08770a3,,True,False,True,4,30,145.0,3,True,4,Tests_passed,147a7b0309bfe281310d919ce0204b76525d7b7adecd13954c427c90272add03,True,Tests_passed,f897ea7da8f55e50f011b4dc53a2582cdca7da12032b0cb6c5a3786ceb5695f0,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,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_failed,206c0e857666db8b18d5b1936a78cad5a6da64b3ab31328dda49f81e0df676ee,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,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,de0348e3aec604b2ca82eac0f32c28730453fdb74552848d1b386f5c3f858855,Tests_failed,206c0e857666db8b18d5b1936a78cad5a6da64b3ab31328dda49f81e0df676ee,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,0.048470497131347656,0.052896738052368164,0.0530552864074707,0.02012467384338379,0.05224776268005371,0.049524545669555664,0.049344778060913086,0.2246718406677246,0.16437721252441406,2.7011666297912598,0.6241703033447266,0.03590250015258789,0.09258913993835449,0.03499770164489746,0.089447021484375,0.09384870529174805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +78,refs/remotes/origin/pull/217,03052f76c71af1b9b91e2c8023490c30456e2d45,5d90107c4a8a2c6a9bc2019dcfd3e119603fe6a0,1eafa3e2cda365e57967ca2b618b6b5aa08770a3,,True,False,True,4,30,145.0,3,True,4,Tests_passed,147a7b0309bfe281310d919ce0204b76525d7b7adecd13954c427c90272add03,True,Tests_passed,f897ea7da8f55e50f011b4dc53a2582cdca7da12032b0cb6c5a3786ceb5695f0,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,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_failed,206c0e857666db8b18d5b1936a78cad5a6da64b3ab31328dda49f81e0df676ee,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,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,de0348e3aec604b2ca82eac0f32c28730453fdb74552848d1b386f5c3f858855,Tests_failed,206c0e857666db8b18d5b1936a78cad5a6da64b3ab31328dda49f81e0df676ee,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,0.048470497131347656,0.052896738052368164,0.0530552864074707,0.02012467384338379,0.05224776268005371,0.049524545669555664,0.049344778060913086,0.2246718406677246,0.16437721252441406,2.7011666297912598,0.6241703033447266,0.03590250015258789,0.09258913993835449,0.03499770164489746,0.089447021484375,0.09384870529174805,0.09064221382141113,0.0942542552947998,0.09270262718200684,0.09399271011352539,0.0905311107635498,0.09036779403686523,0.08994770050048828,0.14267778396606445,0.14745116233825684,3.0503063201904297,0.6808032989501953,0.08920145034790039,0.08820152282714844,0.09016823768615723,0.09116315841674805,0.09151530265808105 diff --git a/results/combined/merges_timed/tacitknowledge/jcr-mock.csv b/results/combined/merges_timed/tacitknowledge/jcr-mock.csv index 928b1ab8e2..89195c9d08 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,True,6,27,194.0,2,True,6,Tests_passed,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,True,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,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,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,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,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,f1c7332e70e38ed8aaf5e26b36af4f3e1fdcce4b387635e1ef33907b4488ebb7,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,0.05289626121520996,0.04740548133850098,0.054036855697631836,0.020491361618041992,0.04678964614868164,0.05577564239501953,0.04749703407287598,0.16563010215759277,0.10259485244750977,0.877765417098999,0.3628551959991455,0.03638863563537598,0.0636744499206543,0.03680992126464844,0.06344294548034668,0.061698198318481445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,True,6,27,194.0,2,True,6,Tests_passed,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,True,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,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,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,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,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,f1c7332e70e38ed8aaf5e26b36af4f3e1fdcce4b387635e1ef33907b4488ebb7,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,0.05289626121520996,0.04740548133850098,0.054036855697631836,0.020491361618041992,0.04678964614868164,0.05577564239501953,0.04749703407287598,0.16563010215759277,0.10259485244750977,0.877765417098999,0.3628551959991455,0.03638863563537598,0.0636744499206543,0.03680992126464844,0.06344294548034668,0.061698198318481445,0.06018495559692383,0.05957221984863281,0.061920166015625,0.060629844665527344,0.06135988235473633,0.06182742118835449,0.06257796287536621,0.09346652030944824,0.09245777130126953,0.9532814025878906,0.39576125144958496,0.05967378616333008,0.06000661849975586,0.05950641632080078,0.06107449531555176,0.061301469802856445 diff --git a/results/combined/merges_timed/tackley/dbdeploy.csv b/results/combined/merges_timed/tackley/dbdeploy.csv index 977024758e..87173ba78e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,True,True,True,38,79,1000,32,True,60,Tests_passed,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,True,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,True,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,7db308de47c446f14384d467d7e5883ba65d167327da25a909a5bf10c15bfd24,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,Merge_failed,dcdaa3a4a32bc592280e5dae05e842fcd987bf1e6496626b9d227ae4eabeed9a,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,44100f6e09ab9f412277d95bd0f2060153e2ed435fc697bd4a51f1d2ecac41ee,Merge_failed,68feabe7f2c183f381313171319eafe6dc1bcd9f0cac5ccb9faa11cc81c13d32,Merge_failed,a04a60c3f30bb1ca5316d3897648372e30a12b5ccc0c7ef51a827fd6ca7ce48b,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,0.04839038848876953,0.052559614181518555,0.04446077346801758,0.0184171199798584,0.05119824409484863,0.052079200744628906,0.056581974029541016,0.6682753562927246,0.5694789886474609,2.651601552963257,0.615283727645874,0.07322931289672852,0.1452953815460205,0.07010936737060547,0.1431126594543457,0.14626669883728027 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,True,True,True,38,79,1000,32,True,60,Tests_passed,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,True,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,True,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,7db308de47c446f14384d467d7e5883ba65d167327da25a909a5bf10c15bfd24,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,Merge_failed,dcdaa3a4a32bc592280e5dae05e842fcd987bf1e6496626b9d227ae4eabeed9a,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,44100f6e09ab9f412277d95bd0f2060153e2ed435fc697bd4a51f1d2ecac41ee,Merge_failed,68feabe7f2c183f381313171319eafe6dc1bcd9f0cac5ccb9faa11cc81c13d32,Merge_failed,a04a60c3f30bb1ca5316d3897648372e30a12b5ccc0c7ef51a827fd6ca7ce48b,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,2fdfa96e0d5652e35d5af4366d12a3689ef0c6ba9ca0adaa4047a2f8ddf0a70e,Merge_failed,7e1ab80914fd8a3ecb28a9edbdaf30feeeec77b211b79309db0a9d9b48244a80,0.04839038848876953,0.052559614181518555,0.04446077346801758,0.0184171199798584,0.05119824409484863,0.052079200744628906,0.056581974029541016,0.6682753562927246,0.5694789886474609,2.651601552963257,0.615283727645874,0.07322931289672852,0.1452953815460205,0.07010936737060547,0.1431126594543457,0.14626669883728027,0.1377103328704834,0.13680076599121094,0.13541388511657715,0.13662004470825195,0.13684821128845215,0.13942956924438477,0.13525843620300293,0.2978072166442871,0.3625802993774414,2.8192811012268066,0.7617192268371582,0.13745594024658203,0.1360766887664795,0.13647985458374023,0.13907766342163086,0.13808727264404297 diff --git a/results/combined/merges_timed/tadglines/socket.io-java.csv b/results/combined/merges_timed/tadglines/socket.io-java.csv index 8fe1d8a9b6..b8e9b9f88e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,True,100,203,5642,3,True,101,Tests_passed,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,True,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,True,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,604f000927785c46a80ec3fc8956abeeaee2fb33a6b8f31c52249107f514e646,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,40cee5a4dc0fff598ab4856bc440f12e3b49bdab968816ce1b9e8502495ed805,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,0.05713057518005371,0.05605483055114746,0.04126691818237305,0.024425745010375977,0.07038998603820801,0.06493210792541504,0.05194401741027832,0.23194026947021484,0.13475394248962402,0.5069625377655029,1.6605629920959473,0.055027008056640625,0.053267717361450195,0.05456972122192383,0.05601668357849121,0.05694270133972168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,True,100,203,5642,3,True,101,Tests_passed,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,True,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,True,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,604f000927785c46a80ec3fc8956abeeaee2fb33a6b8f31c52249107f514e646,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,40cee5a4dc0fff598ab4856bc440f12e3b49bdab968816ce1b9e8502495ed805,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,0.05713057518005371,0.05605483055114746,0.04126691818237305,0.024425745010375977,0.07038998603820801,0.06493210792541504,0.05194401741027832,0.23194026947021484,0.13475394248962402,0.5069625377655029,1.6605629920959473,0.055027008056640625,0.053267717361450195,0.05456972122192383,0.05601668357849121,0.05694270133972168,0.05384993553161621,0.05390429496765137,0.05542635917663574,0.05617260932922363,0.05650448799133301,0.055449724197387695,0.055475473403930664,0.09853434562683105,0.0897512435913086,0.5014793872833252,1.7509474754333496,0.05336403846740723,0.05414247512817383,0.05504798889160156,0.0540766716003418,0.05480790138244629 diff --git a/results/combined/merges_timed/taimos/daemon-framework.csv b/results/combined/merges_timed/taimos/daemon-framework.csv index 682cfdcdcd..17e44fbc7f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,True,False,Tests_passed,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,True,3,3,6,3,True,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,True,3,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,695108cb5cc5792fc21d161fe390c2f8dada4a5f6c99f3147224f54fbcd8c6e2,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,8aecb353f192de154bbf6bbc29eb98bc40fba77d6c4bf0e4a178498748b215f6,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,3c7523c0e223bb3fb804820b51d52800ecd2f21b954a4f3cefe5c2636a7eb135,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,0.04091382026672363,0.03199124336242676,0.03783845901489258,0.014628887176513672,0.03195905685424805,0.04061484336853027,0.04035615921020508,0.17400908470153809,0.18381094932556152,0.8892562389373779,0.28873133659362793,0.052079200744628906,0.053353071212768555,0.05230283737182617,0.05453157424926758,0.053723812103271484 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,True,False,Tests_passed,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,True,3,3,6,3,True,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,True,3,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,695108cb5cc5792fc21d161fe390c2f8dada4a5f6c99f3147224f54fbcd8c6e2,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,8aecb353f192de154bbf6bbc29eb98bc40fba77d6c4bf0e4a178498748b215f6,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,3c7523c0e223bb3fb804820b51d52800ecd2f21b954a4f3cefe5c2636a7eb135,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,0.04091382026672363,0.03199124336242676,0.03783845901489258,0.014628887176513672,0.03195905685424805,0.04061484336853027,0.04035615921020508,0.17400908470153809,0.18381094932556152,0.8892562389373779,0.28873133659362793,0.052079200744628906,0.053353071212768555,0.05230283737182617,0.05453157424926758,0.053723812103271484,0.051017045974731445,0.051668405532836914,0.05138897895812988,0.0522770881652832,0.05200457572937012,0.05291175842285156,0.052092552185058594,0.09915971755981445,0.11663150787353516,0.928307056427002,0.3462851047515869,0.05308413505554199,0.0525815486907959,0.05272555351257324,0.05259227752685547,0.052248477935791016 diff --git a/results/combined/merges_timed/takari/maven-polyglot.csv b/results/combined/merges_timed/takari/maven-polyglot.csv index 464dbe1c7b..25f5810900 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,True,189,325,844,6,True,189,Tests_passed,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,True,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,True,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,4e30b7a9c9a034e657831f288ed056a7396ac78aa914f6a3469454daf14417d9,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,Merge_failed,99cef7ea6d4e86811953181796e3d3d1051c282b053daef6f60af97ce16abec7,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,c42d275b6da9efc83c18f03ae8705fbe70ace4b4c63a43fe324f32a75f851106,Merge_failed,3f85207caf07dc30dd29a1ce32473e9e2dd97cc35576fb31f7ed4827fc7cbe08,Merge_failed,dc0f1380de19b1fd9d5b750288d94ca37d2e96ddaf8887000121148750f2cbcf,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,0.01901984214782715,0.018642425537109375,0.020608186721801758,0.03063797950744629,0.03937101364135742,0.02161693572998047,0.021588563919067383,0.10232329368591309,0.29697418212890625,2.5837721824645996,1.1735732555389404,0.08362078666687012,0.12503361701965332,0.08931827545166016,0.13221144676208496,0.13393878936767578 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,True,189,325,844,6,True,189,Tests_passed,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,True,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,True,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,4e30b7a9c9a034e657831f288ed056a7396ac78aa914f6a3469454daf14417d9,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,Merge_failed,99cef7ea6d4e86811953181796e3d3d1051c282b053daef6f60af97ce16abec7,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,c42d275b6da9efc83c18f03ae8705fbe70ace4b4c63a43fe324f32a75f851106,Merge_failed,3f85207caf07dc30dd29a1ce32473e9e2dd97cc35576fb31f7ed4827fc7cbe08,Merge_failed,dc0f1380de19b1fd9d5b750288d94ca37d2e96ddaf8887000121148750f2cbcf,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,84ca1509181026bad4b0bbf72581e103791cc72598389fe7368ef22bcadd9878,Merge_failed,956b2e0dbe2c733948adf74882a194343a38fd676360853d56624045f6d5c097,0.01901984214782715,0.018642425537109375,0.020608186721801758,0.03063797950744629,0.03937101364135742,0.02161693572998047,0.021588563919067383,0.10232329368591309,0.29697418212890625,2.5837721824645996,1.1735732555389404,0.08362078666687012,0.12503361701965332,0.08931827545166016,0.13221144676208496,0.13393878936767578,0.12561368942260742,0.12565326690673828,0.12701678276062012,0.12992167472839355,0.1272437572479248,0.13123154640197754,0.13089728355407715,0.23185157775878906,0.26680517196655273,2.808340311050415,1.3044297695159912,0.12508201599121094,0.12874150276184082,0.12775588035583496,0.12687182426452637,0.12390446662902832 diff --git a/results/combined/merges_timed/takari/maven-profiler.csv b/results/combined/merges_timed/takari/maven-profiler.csv index 66bc78fee1..884f13000d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,True,True,Tests_passed,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,True,15,28,289,2,True,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,True,15,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,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Tests_failed,060b51bd82b48feb35cb776f367b829f7b7e2c6bed0e79a8ac24eb5f9968cdbf,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,d3fd06164edf4acca7df26088c611bc725da2f4d8a80b2e5f6421cc7ea50285a,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,eb856621145ace9a16fb2a5fbab86b7c31125c878e9e802c337bb1a38a1aa4e3,Tests_failed,6c44c26af2f88f2cb523af8e7d9d5720d62aaa7dbb04b29db43cd0b0cfd26538,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,0.03977608680725098,0.03958272933959961,0.03516364097595215,0.012403488159179688,0.03660225868225098,0.035181522369384766,0.03385448455810547,0.16474246978759766,0.11278104782104492,0.43213319778442383,0.4161050319671631,0.03842616081237793,0.04021286964416504,0.04047870635986328,0.04369807243347168,0.04453921318054199 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,True,True,Tests_passed,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,True,15,28,289,2,True,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,True,15,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,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Tests_failed,060b51bd82b48feb35cb776f367b829f7b7e2c6bed0e79a8ac24eb5f9968cdbf,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,d3fd06164edf4acca7df26088c611bc725da2f4d8a80b2e5f6421cc7ea50285a,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,eb856621145ace9a16fb2a5fbab86b7c31125c878e9e802c337bb1a38a1aa4e3,Tests_failed,6c44c26af2f88f2cb523af8e7d9d5720d62aaa7dbb04b29db43cd0b0cfd26538,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,0.03977608680725098,0.03958272933959961,0.03516364097595215,0.012403488159179688,0.03660225868225098,0.035181522369384766,0.03385448455810547,0.16474246978759766,0.11278104782104492,0.43213319778442383,0.4161050319671631,0.03842616081237793,0.04021286964416504,0.04047870635986328,0.04369807243347168,0.04453921318054199,0.0437624454498291,0.042970895767211914,0.04384279251098633,0.04427289962768555,0.04336071014404297,0.04273366928100586,0.04404187202453613,0.0750739574432373,0.07525181770324707,0.5110647678375244,0.49544501304626465,0.044805288314819336,0.04373335838317871,0.043471336364746094,0.0447237491607666,0.04420971870422363 diff --git a/results/combined/merges_timed/taotaotheripper/sault.csv b/results/combined/merges_timed/taotaotheripper/sault.csv index fbd4f4cd72..649f134194 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,True,True,Tests_passed,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,True,13,80,481,3,True,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,True,13,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,b87e902701bccca60a6922cbd3fcf6a887ce9d0705e434ca47e7cec8132a0162,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,cffd54bc69d97a426ddad4e772cd2f646267b0e26c92b2f3183146161e2e4d58,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,fc9cefeaeaef622e18b4b632c0ba71e3b24c07a7a92ca43a5021c2af0a74449e,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,0.008306741714477539,0.008397817611694336,0.008479595184326172,0.013965129852294922,0.00822901725769043,0.008214235305786133,0.008481025695800781,0.04323387145996094,0.12239646911621094,1.458219051361084,0.6100649833679199,0.05080270767211914,0.05375313758850098,0.053518056869506836,0.05787348747253418,0.0573272705078125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,True,True,Tests_passed,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,True,13,80,481,3,True,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,True,13,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,b87e902701bccca60a6922cbd3fcf6a887ce9d0705e434ca47e7cec8132a0162,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,cffd54bc69d97a426ddad4e772cd2f646267b0e26c92b2f3183146161e2e4d58,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,fc9cefeaeaef622e18b4b632c0ba71e3b24c07a7a92ca43a5021c2af0a74449e,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,0.008306741714477539,0.008397817611694336,0.008479595184326172,0.013965129852294922,0.00822901725769043,0.008214235305786133,0.008481025695800781,0.04323387145996094,0.12239646911621094,1.458219051361084,0.6100649833679199,0.05080270767211914,0.05375313758850098,0.053518056869506836,0.05787348747253418,0.0573272705078125,0.057037353515625,0.05773425102233887,0.0549619197845459,0.05466723442077637,0.05489063262939453,0.05434107780456543,0.05582928657531738,0.10136771202087402,0.11794233322143555,1.734593152999878,0.7230997085571289,0.05717325210571289,0.0583043098449707,0.05635523796081543,0.05566120147705078,0.056329965591430664 diff --git a/results/combined/merges_timed/tarql/tarql.csv b/results/combined/merges_timed/tarql/tarql.csv index 462a0b420f..d9f380a9ab 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,True,True,Tests_passed,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,True,5,14,119,2,True,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,True,5,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,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,05eba303d222717b2310dc79c7e6bf5ecec16bf1d640f660d9bc2c2a9c2f91f1,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,0.035048484802246094,0.03992176055908203,0.03750753402709961,0.013734817504882812,0.022405385971069336,0.03984332084655762,0.03847360610961914,0.15937566757202148,0.10741233825683594,0.9291791915893555,0.2954123020172119,0.0400080680847168,0.04242539405822754,0.040467262268066406,0.0432896614074707,0.042940378189086914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,True,True,Tests_passed,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,True,5,14,119,2,True,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,True,5,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,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,05eba303d222717b2310dc79c7e6bf5ecec16bf1d640f660d9bc2c2a9c2f91f1,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,0.035048484802246094,0.03992176055908203,0.03750753402709961,0.013734817504882812,0.022405385971069336,0.03984332084655762,0.03847360610961914,0.15937566757202148,0.10741233825683594,0.9291791915893555,0.2954123020172119,0.0400080680847168,0.04242539405822754,0.040467262268066406,0.0432896614074707,0.042940378189086914,0.0411381721496582,0.04218554496765137,0.04262495040893555,0.04166984558105469,0.04221987724304199,0.041970014572143555,0.042322635650634766,0.07522940635681152,0.08294272422790527,1.0530002117156982,0.36330509185791016,0.04169106483459473,0.04317736625671387,0.04252958297729492,0.04330754280090332,0.04258298873901367 diff --git a/results/combined/merges_timed/tasermonkey/thumbnailator.csv b/results/combined/merges_timed/tasermonkey/thumbnailator.csv index 9300c3423e..2ccdbbd9af 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,True,5,16,997,2,True,5,Tests_passed,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,True,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,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,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Merge_timedout,,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,d0782523a4a1d399b7761448040c18d795a4f8d71b7a195c36540b4999827034,Merge_timedout,,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,0.050701141357421875,0.013884782791137695,0.014980077743530273,0.07035613059997559,0.01704883575439453,0.049243927001953125,0.056847333908081055,0.16471004486083984,0.11032509803771973,2.0568888187408447,-1.0,0.037659406661987305,0.09637594223022461,0.10645198822021484,0.07236766815185547,0.12445640563964844 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,True,5,16,997,2,True,5,Tests_passed,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,True,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,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,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Merge_timedout,,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,d0782523a4a1d399b7761448040c18d795a4f8d71b7a195c36540b4999827034,Merge_timedout,,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,Tests_passed,ec57d8c5e8d40ac89f94a696fae26c1879fcedfa874fb851a83ef883f4198a41,0.050701141357421875,0.013884782791137695,0.014980077743530273,0.07035613059997559,0.01704883575439453,0.049243927001953125,0.056847333908081055,0.16471004486083984,0.11032509803771973,2.0568888187408447,-1.0,0.037659406661987305,0.09637594223022461,0.10645198822021484,0.07236766815185547,0.12445640563964844,0.11669230461120605,0.15213441848754883,0.16388630867004395,0.07363605499267578,0.13488125801086426,0.15697956085205078,0.1576519012451172,0.22387027740478516,0.20639872550964355,2.427783250808716,-1.0,0.08006739616394043,0.1480705738067627,0.13874411582946777,0.07361698150634766,0.1404421329498291 diff --git a/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv b/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv index f694dc1bba..01e3bc5dd5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,True,40,189,705.0,7,True,40,Tests_passed,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,True,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,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,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,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,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,7d5d0ad4569b12593956a4b8c2cf37cfbf3176e54b5440cf6104503386b42b5d,Tests_failed,6d19655f34c6b5cbe08f1ada662203c1f3a3f86c159c8bf90a7415ff6c255940,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,0.016752243041992188,0.017255067825317383,0.020101308822631836,0.028885841369628906,0.020020246505737305,0.01999354362487793,0.02037358283996582,0.11244726181030273,0.3364527225494385,6.4538414478302,0.8937623500823975,0.047104597091674805,0.18822622299194336,0.048499345779418945,0.18491506576538086,0.18926692008972168 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,True,40,189,705.0,7,True,40,Tests_passed,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,True,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,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,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,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,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,7d5d0ad4569b12593956a4b8c2cf37cfbf3176e54b5440cf6104503386b42b5d,Tests_failed,6d19655f34c6b5cbe08f1ada662203c1f3a3f86c159c8bf90a7415ff6c255940,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,0.016752243041992188,0.017255067825317383,0.020101308822631836,0.028885841369628906,0.020020246505737305,0.01999354362487793,0.02037358283996582,0.11244726181030273,0.3364527225494385,6.4538414478302,0.8937623500823975,0.047104597091674805,0.18822622299194336,0.048499345779418945,0.18491506576538086,0.18926692008972168,0.1797492504119873,0.18659400939941406,0.17503809928894043,0.18618226051330566,0.1801772117614746,0.18837928771972656,0.18087339401245117,0.30609869956970215,0.3333559036254883,6.95001482963562,0.9376728534698486,0.18145537376403809,0.18317151069641113,0.17846298217773438,0.18807530403137207,0.1883406639099121 diff --git a/results/combined/merges_timed/tcurdt/jdeb.csv b/results/combined/merges_timed/tcurdt/jdeb.csv index 093aaa894d..cf38e26391 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -84,refs/remotes/origin/pull/139,bbf1c1ad25cd27b141e5973cc7d70575a951faf4,cd5398c82520d7200a428fa90daa50f1b5b79413,f5a3be7ac1c646b94e9c197d12061cb33d2fa32e,,True,True,Tests_passed,e9fd9b2e220fb8c5f4bcf29f8d1650e34aecc6d37d82ee24ba32cd3c742628da,True,27,84,949,5,True,Tests_passed,aafeef1a862eb9c473dd7e94a56b69b88eebb106923abe3d272f035c60d1d94c,True,27,True,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,e3355a73299757774d51087b3b92add2f114e5879edcc031f889ec67bf28b866,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,5e6dc71ec77754919e16c07220afa8fbfc92e273eee2ec73e8f37297f0e8dab4,Merge_failed,b87ea880f7c1e2f51a543e76e5f59e87994333e695f730d1cbff230eeb81acab,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,12523c0109e5b555c5659129f52f7853a8672ad329fee46b89a107cd855f8bcc,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,fc16fd25ab7f18897ab17191e6db67268318ab6839dc87071aa65b170471d825,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,0.056647539138793945,0.04537677764892578,0.0582125186920166,0.02138543128967285,0.035658836364746094,0.05364274978637695,0.05900263786315918,0.3859422206878662,0.28548479080200195,1.781719446182251,0.5633127689361572,0.06271076202392578,0.09904003143310547,0.06163334846496582,0.10345792770385742,0.1031351089477539 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +84,refs/remotes/origin/pull/139,bbf1c1ad25cd27b141e5973cc7d70575a951faf4,cd5398c82520d7200a428fa90daa50f1b5b79413,f5a3be7ac1c646b94e9c197d12061cb33d2fa32e,,True,True,Tests_passed,e9fd9b2e220fb8c5f4bcf29f8d1650e34aecc6d37d82ee24ba32cd3c742628da,True,27,84,949,5,True,Tests_passed,aafeef1a862eb9c473dd7e94a56b69b88eebb106923abe3d272f035c60d1d94c,True,27,True,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,e3355a73299757774d51087b3b92add2f114e5879edcc031f889ec67bf28b866,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,5e6dc71ec77754919e16c07220afa8fbfc92e273eee2ec73e8f37297f0e8dab4,Merge_failed,b87ea880f7c1e2f51a543e76e5f59e87994333e695f730d1cbff230eeb81acab,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,12523c0109e5b555c5659129f52f7853a8672ad329fee46b89a107cd855f8bcc,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,fc16fd25ab7f18897ab17191e6db67268318ab6839dc87071aa65b170471d825,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,0.056647539138793945,0.04537677764892578,0.0582125186920166,0.02138543128967285,0.035658836364746094,0.05364274978637695,0.05900263786315918,0.3859422206878662,0.28548479080200195,1.781719446182251,0.5633127689361572,0.06271076202392578,0.09904003143310547,0.06163334846496582,0.10345792770385742,0.1031351089477539,0.09862804412841797,0.09473466873168945,0.10058736801147461,0.09979701042175293,0.09638094902038574,0.09704089164733887,0.09561896324157715,0.17888808250427246,0.21054434776306152,1.813882827758789,0.6772041320800781,0.10103249549865723,0.10156416893005371,0.10065126419067383,0.10003089904785156,0.09453225135803223 diff --git a/results/combined/merges_timed/tdebatty/string-similarity.csv b/results/combined/merges_timed/tdebatty/string-similarity.csv index b58280b38d..1d165f0bb4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,True,5,8,134,2,True,5,Tests_passed,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,True,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,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,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,d9c0fda2c99460482c13ea88057d3a5e0874d975042f1cdc7de68df6f85d39ed,Tests_passed,9a5809a2af5e0205fc0aadcfbe54cc8003481a6cb00b2e26c379cd86061e00dc,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,0.03553462028503418,0.03863644599914551,0.03687739372253418,0.012663602828979492,0.03679299354553223,0.027471065521240234,0.029201507568359375,0.16185355186462402,0.11900568008422852,0.6155436038970947,0.2630586624145508,0.03803133964538574,0.05080699920654297,0.03845071792602539,0.05096435546875,0.05145573616027832 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,True,5,8,134,2,True,5,Tests_passed,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,True,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,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,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,d9c0fda2c99460482c13ea88057d3a5e0874d975042f1cdc7de68df6f85d39ed,Tests_passed,9a5809a2af5e0205fc0aadcfbe54cc8003481a6cb00b2e26c379cd86061e00dc,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,Tests_passed,4ad483390e9bc7e8e7f46d9acdb363de5c402f8f43e6cbab8e0f6c3b0a19636e,0.03553462028503418,0.03863644599914551,0.03687739372253418,0.012663602828979492,0.03679299354553223,0.027471065521240234,0.029201507568359375,0.16185355186462402,0.11900568008422852,0.6155436038970947,0.2630586624145508,0.03803133964538574,0.05080699920654297,0.03845071792602539,0.05096435546875,0.05145573616027832,0.050176382064819336,0.05075883865356445,0.051599740982055664,0.050675153732299805,0.050755977630615234,0.050076961517333984,0.04986715316772461,0.08341622352600098,0.0880436897277832,0.7003068923950195,0.33098554611206055,0.05303788185119629,0.051445722579956055,0.05058765411376953,0.05080866813659668,0.04995131492614746 diff --git a/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv b/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv index 5615be58fa..0c21fcd43c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,True,36,133,1188,14,True,36,Tests_passed,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,True,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,True,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,c02643b2efdd21d2b9e2a247f6370d22beb7b4060cc49169b4178acaf16123ce,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,d8321ef91786df3a532b85a053c46c244bf6a6f2b5bf4370cfe09f10f52c7834,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,f61493346920c467709091f6a055e968f505762da931a34527e1cf7e4cacaacd,Merge_failed,b220a744959f0a790ed0eac2d8a5ada8313b04f832e032ad5acfccf5a4fc923c,Merge_failed,dad71a68f931b7b39f776a52f739bab5184e90d555bceb10e484508450dd50e5,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,0.04657745361328125,0.046735286712646484,0.051160335540771484,0.024508237838745117,0.04456925392150879,0.0327916145324707,0.04673600196838379,0.9252209663391113,0.8061039447784424,5.48820161819458,0.47315096855163574,0.12514090538024902,0.15324616432189941,0.1373891830444336,0.15087270736694336,0.15248322486877441 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,True,36,133,1188,14,True,36,Tests_passed,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,True,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,True,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,c02643b2efdd21d2b9e2a247f6370d22beb7b4060cc49169b4178acaf16123ce,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,d8321ef91786df3a532b85a053c46c244bf6a6f2b5bf4370cfe09f10f52c7834,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,f61493346920c467709091f6a055e968f505762da931a34527e1cf7e4cacaacd,Merge_failed,b220a744959f0a790ed0eac2d8a5ada8313b04f832e032ad5acfccf5a4fc923c,Merge_failed,dad71a68f931b7b39f776a52f739bab5184e90d555bceb10e484508450dd50e5,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,fd25e372348894d25a08f26815abd81e6ac7b4afc6e4e7921810800ad6191d86,Merge_failed,3519e8505b33f2ce0ef8d46117c05cdc24f0706062e5edda3dce51d09ef1bac4,0.04657745361328125,0.046735286712646484,0.051160335540771484,0.024508237838745117,0.04456925392150879,0.0327916145324707,0.04673600196838379,0.9252209663391113,0.8061039447784424,5.48820161819458,0.47315096855163574,0.12514090538024902,0.15324616432189941,0.1373891830444336,0.15087270736694336,0.15248322486877441,0.1495053768157959,0.15774822235107422,0.16066837310791016,0.14624762535095215,0.14986872673034668,0.1581428050994873,0.16126108169555664,0.3876070976257324,0.5096015930175781,5.990123510360718,0.6885271072387695,0.14927458763122559,0.1539616584777832,0.16097331047058105,0.14947032928466797,0.1497185230255127 diff --git a/results/combined/merges_timed/tdunning/log-synth.csv b/results/combined/merges_timed/tdunning/log-synth.csv index be7cd19eb7..86be8ddf5b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,Tests_passed,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,True,8,9,42865,3,True,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,True,8,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,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,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,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,8dd04385e358eb75ddb41b042ea4ef9672c440ec8d07317dd6fedc704d3ff580,Tests_failed,46be5247fc7f8d3c3cad6827dcba2c7a09fdaf1bffda6a7bb61b682088cd9ae1,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,0.03777003288269043,0.05052804946899414,0.0839383602142334,0.09357023239135742,0.08615827560424805,0.08973956108093262,0.0925607681274414,0.2381596565246582,0.17780160903930664,0.7133419513702393,0.3428385257720947,0.14210844039916992,0.13950490951538086,0.13694334030151367,0.1900932788848877,0.1629340648651123 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,Tests_passed,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,True,8,9,42865,3,True,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,True,8,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,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,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,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,8dd04385e358eb75ddb41b042ea4ef9672c440ec8d07317dd6fedc704d3ff580,Tests_failed,46be5247fc7f8d3c3cad6827dcba2c7a09fdaf1bffda6a7bb61b682088cd9ae1,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,0.03777003288269043,0.05052804946899414,0.0839383602142334,0.09357023239135742,0.08615827560424805,0.08973956108093262,0.0925607681274414,0.2381596565246582,0.17780160903930664,0.7133419513702393,0.3428385257720947,0.14210844039916992,0.13950490951538086,0.13694334030151367,0.1900932788848877,0.1629340648651123,0.19132137298583984,0.1323709487915039,0.22322940826416016,0.21806836128234863,0.22403836250305176,0.16230463981628418,0.2191779613494873,0.2542717456817627,0.2767214775085449,0.8318266868591309,0.48308753967285156,0.13919806480407715,0.2004554271697998,0.18707752227783203,0.13201212882995605,0.19476938247680664 diff --git a/results/combined/merges_timed/tdunning/t-digest.csv b/results/combined/merges_timed/tdunning/t-digest.csv index 95462041bd..6ef377eeee 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,True,13,55,218.0,4,True,13,Tests_passed,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,True,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,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,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,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,0f5441a3162480a0f497b7a49492f865c0f2dbec3216fd0583bb368eb633a352,Tests_failed,c97b8eff3247908a0665616d463ae3bdb327efb19af9dbddae990cebeef234b2,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,0.04175567626953125,0.03976869583129883,0.07410430908203125,0.07113933563232422,0.055344581604003906,0.05438947677612305,0.0605473518371582,0.3115413188934326,0.21319890022277832,3.320234775543213,0.6705644130706787,0.10473299026489258,0.18649792671203613,0.10779619216918945,0.20127058029174805,0.19572949409484863 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,True,13,55,218.0,4,True,13,Tests_passed,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,True,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,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,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,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,0f5441a3162480a0f497b7a49492f865c0f2dbec3216fd0583bb368eb633a352,Tests_failed,c97b8eff3247908a0665616d463ae3bdb327efb19af9dbddae990cebeef234b2,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,0.04175567626953125,0.03976869583129883,0.07410430908203125,0.07113933563232422,0.055344581604003906,0.05438947677612305,0.0605473518371582,0.3115413188934326,0.21319890022277832,3.320234775543213,0.6705644130706787,0.10473299026489258,0.18649792671203613,0.10779619216918945,0.20127058029174805,0.19572949409484863,0.1867072582244873,0.19774961471557617,0.16025114059448242,0.20458507537841797,0.21451306343078613,0.15892291069030762,0.2100200653076172,0.30484771728515625,0.29350781440734863,3.8309240341186523,0.7577624320983887,0.19266700744628906,0.20061159133911133,0.19201254844665527,0.18775081634521484,0.18985748291015625 diff --git a/results/combined/merges_timed/teamed/qulice.csv b/results/combined/merges_timed/teamed/qulice.csv index 477d01fd64..dbbf78a5ed 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,True,True,True,21,47,384,4,True,22,Tests_passed,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,True,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,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_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,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,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,0.05356478691101074,0.04167675971984863,0.050629377365112305,0.02196812629699707,0.05175304412841797,0.05104851722717285,0.055185556411743164,0.29207921028137207,0.22446084022521973,0.03240346908569336,0.4331953525543213,0.06215977668762207,0.10732007026672363,0.04072856903076172,0.11082744598388672,0.11050629615783691 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,True,True,True,21,47,384,4,True,22,Tests_passed,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,True,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,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_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,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,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,0.05356478691101074,0.04167675971984863,0.050629377365112305,0.02196812629699707,0.05175304412841797,0.05104851722717285,0.055185556411743164,0.29207921028137207,0.22446084022521973,0.03240346908569336,0.4331953525543213,0.06215977668762207,0.10732007026672363,0.04072856903076172,0.11082744598388672,0.11050629615783691,0.10988664627075195,0.10822629928588867,0.11210751533508301,0.11098194122314453,0.11013984680175781,0.11001944541931152,0.11095046997070312,0.18356704711914062,0.19086289405822754,0.12625837326049805,0.5021774768829346,0.1098933219909668,0.10911130905151367,0.11136794090270996,0.10713481903076172,0.10935020446777344 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 d9e7219226..0666456c42 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,,True,9,15,,3,True,10,Tests_passed,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,True,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,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,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,31e7b56921194ee491fb1f89c910f939414a825a31251d55aae4dec163900595,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,0.02446126937866211,0.03871917724609375,0.03851795196533203,0.014203548431396484,0.0369105339050293,0.04306507110595703,0.04577231407165527,0.1595461368560791,0.10589385032653809,0.519024133682251,0.33179593086242676,0.030726194381713867,0.05578494071960449,0.03170633316040039,0.055797576904296875,0.05655503273010254 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,,True,9,15,,3,True,10,Tests_passed,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,True,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,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,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,31e7b56921194ee491fb1f89c910f939414a825a31251d55aae4dec163900595,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,Tests_passed,7d0da8b9ce565221e9d93b45df41fcf346f232ac70ca6ec87907b28adab6c7b0,0.02446126937866211,0.03871917724609375,0.03851795196533203,0.014203548431396484,0.0369105339050293,0.04306507110595703,0.04577231407165527,0.1595461368560791,0.10589385032653809,0.519024133682251,0.33179593086242676,0.030726194381713867,0.05578494071960449,0.03170633316040039,0.055797576904296875,0.05655503273010254,0.055913686752319336,0.05560445785522461,0.05643463134765625,0.05638313293457031,0.05681467056274414,0.05710721015930176,0.05614781379699707,0.08920454978942871,0.09007143974304199,0.5527124404907227,0.390491247177124,0.05486130714416504,0.05476856231689453,0.05705857276916504,0.05670332908630371,0.05590534210205078 diff --git a/results/combined/merges_timed/techblue/alfresco-restclient.csv b/results/combined/merges_timed/techblue/alfresco-restclient.csv index d12672518b..0e1369f27c 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,True,True,Tests_passed,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,True,30,92,847,2,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,30,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,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,3d6b41ff832e3742e6a6c4a4060a9b7a026d41e97d5502589bb64067c3b5ec83,Tests_failed,2e9f4fe5e9740217033280e4aedbff85b623f4be8394b22dae55674032746ea8,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,0.011607646942138672,0.011668920516967773,0.012777328491210938,0.01946401596069336,0.012756586074829102,0.01267695426940918,0.012707948684692383,0.038208723068237305,0.06641554832458496,0.7202482223510742,0.6507556438446045,0.03877568244934082,0.06450438499450684,0.03824162483215332,0.06436038017272949,0.0648946762084961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,True,True,Tests_passed,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,True,30,92,847,2,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,30,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,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,3d6b41ff832e3742e6a6c4a4060a9b7a026d41e97d5502589bb64067c3b5ec83,Tests_failed,2e9f4fe5e9740217033280e4aedbff85b623f4be8394b22dae55674032746ea8,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,Tests_passed,2dfacce5f98bb5f4ffebf7db01ad3f3bfd4bd69b1c5a3dab7d72d6705db43234,0.011607646942138672,0.011668920516967773,0.012777328491210938,0.01946401596069336,0.012756586074829102,0.01267695426940918,0.012707948684692383,0.038208723068237305,0.06641554832458496,0.7202482223510742,0.6507556438446045,0.03877568244934082,0.06450438499450684,0.03824162483215332,0.06436038017272949,0.0648946762084961,0.06164264678955078,0.0626683235168457,0.06358599662780762,0.0639333724975586,0.06381011009216309,0.06392884254455566,0.0636444091796875,0.09807133674621582,0.09345006942749023,0.8251402378082275,0.6572597026824951,0.06244206428527832,0.0613400936126709,0.06336855888366699,0.06266641616821289,0.06296205520629883 diff --git a/results/combined/merges_timed/technicpack/launchercore.csv b/results/combined/merges_timed/technicpack/launchercore.csv index be46f18220..11aa5b6d18 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,95e852e2c15b48337950fd0ac77c1b0ebc3ac7c07d31ceeae1a9e5d5dd039e2b,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,a883da704741c565abf3cd0223519b4f9cfbc44b7cdf720abea19237cb34c514,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,bd5e67c40dde9afd4d87979b8ae8b873edb32ec9e1f0fa0d4d4c86eb1503f2a0,Merge_failed,1d3b39461c66002c6b9a24ec4ed84edf012b6d5c30dfb48ca176d30f85ac5726,Merge_failed,537daaf961ed16ec340dad22c9c312272b4773e578dfad275d745e18e7875a0c,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,0.06716561317443848,0.06340694427490234,0.06884217262268066,0.029201745986938477,0.07603025436401367,0.07026505470275879,0.08099937438964844,3.6564536094665527,3.164231777191162,23.768027305603027,4.283266305923462,0.4523305892944336,0.5541467666625977,0.459087610244751,0.583615779876709,0.6304752826690674 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,95e852e2c15b48337950fd0ac77c1b0ebc3ac7c07d31ceeae1a9e5d5dd039e2b,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,a883da704741c565abf3cd0223519b4f9cfbc44b7cdf720abea19237cb34c514,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,bd5e67c40dde9afd4d87979b8ae8b873edb32ec9e1f0fa0d4d4c86eb1503f2a0,Merge_failed,1d3b39461c66002c6b9a24ec4ed84edf012b6d5c30dfb48ca176d30f85ac5726,Merge_failed,537daaf961ed16ec340dad22c9c312272b4773e578dfad275d745e18e7875a0c,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,45816e4f9044cdd8eaa4bf6f63c67b33e0a92993b4ba5370468c66af4fa9e719,Merge_failed,07cd8091a83a9f1c9afa4fb43d01c1daf7279e9607ebf9508646252de6c2e9f6,0.06716561317443848,0.06340694427490234,0.06884217262268066,0.029201745986938477,0.07603025436401367,0.07026505470275879,0.08099937438964844,3.6564536094665527,3.164231777191162,23.768027305603027,4.283266305923462,0.4523305892944336,0.5541467666625977,0.459087610244751,0.583615779876709,0.6304752826690674,0.5513081550598145,0.5792033672332764,0.5553362369537354,0.5891151428222656,0.6208467483520508,0.6213183403015137,0.6054520606994629,1.5829503536224365,1.9711451530456543,24.747252941131592,4.665255546569824,0.5551912784576416,0.5540120601654053,0.5437374114990234,0.5499706268310547,0.5889191627502441 diff --git a/results/combined/merges_timed/technicpack/launcherv3.csv b/results/combined/merges_timed/technicpack/launcherv3.csv index 4e38acf184..88a9e10ef1 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003.0,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,f79d0151008d9466861b3046af004620e467e89ff41db72706ff667c460e7611,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,25b770529cbb2bc4c99ab6f0e5ab18f98f4836856d2c7b60de7b75a03070350c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,25db0bab54ea251c3ac09562d0c9c6217bc8c2de21e92052fa167286a7ab608e,Merge_failed,1d3b39461c66002c6b9a24ec4ed84edf012b6d5c30dfb48ca176d30f85ac5726,Merge_failed,537daaf961ed16ec340dad22c9c312272b4773e578dfad275d745e18e7875a0c,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,0.07431674003601074,0.06747078895568848,0.06656146049499512,0.030333995819091797,0.07654523849487305,0.06823492050170898,0.06670117378234863,3.738886594772339,3.1322431564331055,23.719077587127686,4.105910301208496,0.45781731605529785,0.5698494911193848,0.46254611015319824,0.5767436027526855,0.6251647472381592 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003.0,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,f79d0151008d9466861b3046af004620e467e89ff41db72706ff667c460e7611,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,25b770529cbb2bc4c99ab6f0e5ab18f98f4836856d2c7b60de7b75a03070350c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,25db0bab54ea251c3ac09562d0c9c6217bc8c2de21e92052fa167286a7ab608e,Merge_failed,1d3b39461c66002c6b9a24ec4ed84edf012b6d5c30dfb48ca176d30f85ac5726,Merge_failed,537daaf961ed16ec340dad22c9c312272b4773e578dfad275d745e18e7875a0c,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,86b74c2dc531157e8364de3c85eb2dfbf451bbc1c2f98346d376ed62ee81a3b1,Merge_failed,ac0bb3fbcdfc111d050493eeba9663fed703d9353bc4ff0acc08f83b3beab29d,0.07431674003601074,0.06747078895568848,0.06656146049499512,0.030333995819091797,0.07654523849487305,0.06823492050170898,0.06670117378234863,3.738886594772339,3.1322431564331055,23.719077587127686,4.105910301208496,0.45781731605529785,0.5698494911193848,0.46254611015319824,0.5767436027526855,0.6251647472381592,0.5808737277984619,0.6229536533355713,0.590080976486206,0.6193125247955322,0.6611404418945312,0.658104658126831,0.6531422138214111,1.668259859085083,2.153045654296875,27.237154483795166,4.982269048690796,0.5895206928253174,0.5870866775512695,0.5892915725708008,0.5830044746398926,0.6363687515258789 diff --git a/results/combined/merges_timed/technophobia/substeps-core.csv b/results/combined/merges_timed/technophobia/substeps-core.csv index 38fc46c750..b61a2af4bd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,True,True,Tests_passed,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,True,61,668,4287.0,5,True,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,True,61,True,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,7a8c68287ec73b6318231a953d726c90b83eebc65b151022475206187e9d81c0,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Tests_failed,dc7d72b4a2c22735e07810d3e97c5fb422cf327377be7ca32179341f4bfb82fe,Merge_failed,b35c4cec0328a58a56dedab8dca5a6cf1d04d5638d112078f23cd76e3792089f,Merge_failed,da4b6c35bc583d2d9a8bcbc047e6426a767a5e088ebd4661372e69b322f88fdc,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,f7bdcad37c360976b8f5d970284e52d42aa6c283ce7b263c9655340d12770841,Merge_failed,733640f08acaf0934ef93b99353387bae5146702908f00f58a418b7d891708ed,Merge_failed,733640f08acaf0934ef93b99353387bae5146702908f00f58a418b7d891708ed,Merge_failed,f9ee6f3db19aedb5988bf090ebb06b4109653f8de30d4e37c0a81a50d161ca1c,Merge_failed,ca3449246427e1d01b1f6b719b69c2ba475b05233b02b04d2d873d96e116b6af,Merge_failed,d797deac25608520572fba00af4ee634d252ab89c0cf16e94ab9c028583cab2a,Merge_failed,91925c6d398d1891df466291a6dce98b38e3081b9969bb68a68757cc3c28e83d,Tests_failed,e657a944c0652b200d1429b0dbca30a5a1a83c20faaa306855ce3b705806ad37,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,0.05379438400268555,0.05382037162780762,0.05042099952697754,0.03577589988708496,0.05984091758728027,0.06731557846069336,0.059821367263793945,0.34575891494750977,0.39374828338623047,3.4483702182769775,1.3644812107086182,0.09402680397033691,0.09769415855407715,0.15217924118041992,0.16446280479431152,0.12384724617004395 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,True,True,Tests_passed,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,True,61,668,4287.0,5,True,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,True,61,True,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,7a8c68287ec73b6318231a953d726c90b83eebc65b151022475206187e9d81c0,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Tests_failed,dc7d72b4a2c22735e07810d3e97c5fb422cf327377be7ca32179341f4bfb82fe,Merge_failed,b35c4cec0328a58a56dedab8dca5a6cf1d04d5638d112078f23cd76e3792089f,Merge_failed,da4b6c35bc583d2d9a8bcbc047e6426a767a5e088ebd4661372e69b322f88fdc,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,f7bdcad37c360976b8f5d970284e52d42aa6c283ce7b263c9655340d12770841,Merge_failed,733640f08acaf0934ef93b99353387bae5146702908f00f58a418b7d891708ed,Merge_failed,733640f08acaf0934ef93b99353387bae5146702908f00f58a418b7d891708ed,Merge_failed,f9ee6f3db19aedb5988bf090ebb06b4109653f8de30d4e37c0a81a50d161ca1c,Merge_failed,ca3449246427e1d01b1f6b719b69c2ba475b05233b02b04d2d873d96e116b6af,Merge_failed,d797deac25608520572fba00af4ee634d252ab89c0cf16e94ab9c028583cab2a,Merge_failed,91925c6d398d1891df466291a6dce98b38e3081b9969bb68a68757cc3c28e83d,Tests_failed,e657a944c0652b200d1429b0dbca30a5a1a83c20faaa306855ce3b705806ad37,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,8ecadc58bb6131cd5eec5f5c7c2e87aed7d8f80f88ec1f388c4a805d584e56b2,Merge_failed,5c633eb5dfc60c5266f422817687dac1abf04895df5450a0770b96f74aeea1f0,0.05379438400268555,0.05382037162780762,0.05042099952697754,0.03577589988708496,0.05984091758728027,0.06731557846069336,0.059821367263793945,0.34575891494750977,0.39374828338623047,3.4483702182769775,1.3644812107086182,0.09402680397033691,0.09769415855407715,0.15217924118041992,0.16446280479431152,0.12384724617004395,0.1716930866241455,0.10111284255981445,0.1761000156402588,0.10457468032836914,0.3798408508300781,0.37815308570861816,0.37765002250671387,0.443835973739624,0.535320520401001,3.495912790298462,1.483973503112793,0.16977906227111816,0.16849589347839355,0.17023754119873047,0.17312169075012207,0.11039900779724121 diff --git a/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv b/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv index f8386604c1..967df4fc99 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,Tests_passed,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,True,17,105,1757,12,True,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,True,19,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2b8a6a2902f9fdd51646e5e1120099e0bafbc3cd9f1b4d7f84f2d4057a81e5b8,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,Merge_failed,e434395aafa623247f739b255a0460a009573ec90fa5e8c436d2829ee7945831,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,808cacae5c44dded6a0d0fb2454b230854cf977f8b7d62061b1ae3388abfacc5,Merge_failed,808cacae5c44dded6a0d0fb2454b230854cf977f8b7d62061b1ae3388abfacc5,Merge_failed,af793d4633c0360bc5a1cea9402976c651415c9c4378a46e1f691120e05cc70f,Merge_failed,dca5bde2ef8db748998d0627862be957987c76c9dd25b1c6c7108a5de0dd9f09,Merge_failed,8ee1b34fc81777a5895e141cbdb611ca9b987a80a3edc5d3ad5c283f238fb124,Merge_failed,2a8590ecf52b2c9ca7977d0f644af924c4327a7568fecfc55f4ba8185ea84f6c,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,0.0112152099609375,0.010804176330566406,0.011072874069213867,0.017319202423095703,0.011476755142211914,0.011279582977294922,0.01110529899597168,0.12340760231018066,0.4709489345550537,4.063489675521851,0.5373513698577881,0.13401365280151367,0.13019490242004395,0.17541813850402832,0.2327110767364502,0.16601777076721191 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,Tests_passed,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,True,17,105,1757,12,True,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,True,19,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2b8a6a2902f9fdd51646e5e1120099e0bafbc3cd9f1b4d7f84f2d4057a81e5b8,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,Merge_failed,e434395aafa623247f739b255a0460a009573ec90fa5e8c436d2829ee7945831,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,Merge_failed,808cacae5c44dded6a0d0fb2454b230854cf977f8b7d62061b1ae3388abfacc5,Merge_failed,808cacae5c44dded6a0d0fb2454b230854cf977f8b7d62061b1ae3388abfacc5,Merge_failed,af793d4633c0360bc5a1cea9402976c651415c9c4378a46e1f691120e05cc70f,Merge_failed,dca5bde2ef8db748998d0627862be957987c76c9dd25b1c6c7108a5de0dd9f09,Merge_failed,8ee1b34fc81777a5895e141cbdb611ca9b987a80a3edc5d3ad5c283f238fb124,Merge_failed,2a8590ecf52b2c9ca7977d0f644af924c4327a7568fecfc55f4ba8185ea84f6c,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,aaad2ce98bb3f1d26a3909b8101a90367e8c7772ef72adf10e0b220265c4accc,Merge_failed,1f6743a5223406bb478778aed7d4a5de9f4426c4bbfaf325cde7f4b28a4e0057,0.0112152099609375,0.010804176330566406,0.011072874069213867,0.017319202423095703,0.011476755142211914,0.011279582977294922,0.01110529899597168,0.12340760231018066,0.4709489345550537,4.063489675521851,0.5373513698577881,0.13401365280151367,0.13019490242004395,0.17541813850402832,0.2327110767364502,0.16601777076721191,0.23519229888916016,0.16446805000305176,0.23420190811157227,0.16567492485046387,0.2961149215698242,0.29228806495666504,0.2766585350036621,0.4471395015716553,0.5541861057281494,4.8725457191467285,0.8154392242431641,0.2383122444152832,0.2367105484008789,0.23543167114257812,0.2323753833770752,0.16281652450561523 diff --git a/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv b/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv index e0170ce1a2..2d95c32b55 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,True,20,51,1698.0,3,True,20,Tests_passed,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,True,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,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,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,c05cfe8b7fdbd789ec55f7a3a55c99459e8f27a42109350e4cbf9e081a94bb96,Tests_failed,bc57df12ccc64de8dff5affaae1e114310b63711458a3768f690d5370354788c,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,0.048279523849487305,0.04612231254577637,0.052570343017578125,0.019205093383789062,0.0456850528717041,0.05443882942199707,0.047806501388549805,0.23520445823669434,0.15998005867004395,0.6936957836151123,0.49302053451538086,0.04489398002624512,0.07921314239501953,0.04441070556640625,0.07924294471740723,0.0794072151184082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,True,20,51,1698.0,3,True,20,Tests_passed,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,True,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,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,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,67af25e6206b2cf7e1699e8c6ba1c85128ade2d9425afa6fc9919df888a305c5,Tests_passed,c05cfe8b7fdbd789ec55f7a3a55c99459e8f27a42109350e4cbf9e081a94bb96,Tests_failed,bc57df12ccc64de8dff5affaae1e114310b63711458a3768f690d5370354788c,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,Tests_passed,0dd641e87b0c7d809e985c95b1d2681a4d1cb18662f1038a960d1ab6e940c8b8,0.048279523849487305,0.04612231254577637,0.052570343017578125,0.019205093383789062,0.0456850528717041,0.05443882942199707,0.047806501388549805,0.23520445823669434,0.15998005867004395,0.6936957836151123,0.49302053451538086,0.04489398002624512,0.07921314239501953,0.04441070556640625,0.07924294471740723,0.0794072151184082,0.0794072151184082,0.07834529876708984,0.07863020896911621,0.08144974708557129,0.08010005950927734,0.08211207389831543,0.08103299140930176,0.13536977767944336,0.1373276710510254,0.7918531894683838,0.6380922794342041,0.07778525352478027,0.08049774169921875,0.07933592796325684,0.07925844192504883,0.0807340145111084 diff --git a/results/combined/merges_timed/termd/termd.csv b/results/combined/merges_timed/termd/termd.csv index 34b1b6506b..d14c4a3a89 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,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,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,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,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f2fdb67b169fdaa3fa2c1c9a63d5c07fed2c95f405431bdd3597a7672714e05,Tests_failed,02b96218185faa456faa0598a10e6b4f5eb69af3ba966e48aa9587aee6794cbd,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,0.01897597312927246,0.01926112174987793,0.025281429290771484,0.030924558639526367,0.0254366397857666,0.025339126586914062,0.0250091552734375,0.05398869514465332,0.07519054412841797,0.6783711910247803,1.0578455924987793,0.05894017219543457,0.05904412269592285,0.05964398384094238,0.07973146438598633,0.08226990699768066 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,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,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,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,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f2fdb67b169fdaa3fa2c1c9a63d5c07fed2c95f405431bdd3597a7672714e05,Tests_failed,02b96218185faa456faa0598a10e6b4f5eb69af3ba966e48aa9587aee6794cbd,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,0.01897597312927246,0.01926112174987793,0.025281429290771484,0.030924558639526367,0.0254366397857666,0.025339126586914062,0.0250091552734375,0.05398869514465332,0.07519054412841797,0.6783711910247803,1.0578455924987793,0.05894017219543457,0.05904412269592285,0.05964398384094238,0.07973146438598633,0.08226990699768066,0.07719969749450684,0.0780191421508789,0.05764937400817871,0.08505654335021973,0.08445119857788086,0.08783555030822754,0.08582019805908203,0.12076473236083984,0.10543489456176758,0.793877363204956,1.129410982131958,0.08170700073242188,0.08068037033081055,0.08091545104980469,0.05835413932800293,0.07881331443786621 diff --git a/results/combined/merges_timed/testingbot/testingbot-tunnel.csv b/results/combined/merges_timed/testingbot/testingbot-tunnel.csv index 087fb83f73..48d7c6309d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,False,True,12,23,181,3,True,12,Tests_passed,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,True,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,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,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,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,cb6fff252b23d873b0a264d3004f44202fb5989672cf70f1b7704c5ee3bddfad,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,0.01547551155090332,0.0164644718170166,0.019103527069091797,0.025782346725463867,0.019588232040405273,0.019629716873168945,0.019219636917114258,0.05976581573486328,0.12343192100524902,1.5274429321289062,0.40409111976623535,0.03255820274353027,0.09601259231567383,0.04888558387756348,0.09310007095336914,0.07609057426452637 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,False,True,12,23,181,3,True,12,Tests_passed,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,True,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,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,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,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,cb6fff252b23d873b0a264d3004f44202fb5989672cf70f1b7704c5ee3bddfad,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,0.01547551155090332,0.0164644718170166,0.019103527069091797,0.025782346725463867,0.019588232040405273,0.019629716873168945,0.019219636917114258,0.05976581573486328,0.12343192100524902,1.5274429321289062,0.40409111976623535,0.03255820274353027,0.09601259231567383,0.04888558387756348,0.09310007095336914,0.07609057426452637,0.09208297729492188,0.09317755699157715,0.09714269638061523,0.07549667358398438,0.09345126152038574,0.09236598014831543,0.09247446060180664,0.121185302734375,0.13986921310424805,1.6882665157318115,0.4259467124938965,0.07418560981750488,0.09245896339416504,0.09054756164550781,0.0921030044555664,0.0730280876159668 diff --git a/results/combined/merges_timed/texasdigitallibrary/vireo.csv b/results/combined/merges_timed/texasdigitallibrary/vireo.csv index c4e6d4516f..3122f2ea4a 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,False,Tests_passed,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,True,8,51,241.0,2,True,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,True,8,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,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,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,0d35f81b796c1d832eff74ca8a7a7544ef585a2722c1153fa9130f173edd7508,Tests_failed,d6fcf4f15523f9b500f9db700432c90c1d7f98da9f9246c75d097355ccbe74e6,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,0.014161825180053711,0.014272212982177734,0.015602588653564453,0.022774696350097656,0.014933586120605469,0.015428543090820312,0.014975547790527344,0.04386568069458008,0.06969738006591797,1.7412195205688477,0.4478633403778076,0.043196916580200195,0.0745847225189209,0.04272651672363281,0.0744466781616211,0.07802772521972656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,False,Tests_passed,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,True,8,51,241.0,2,True,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,True,8,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,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,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,0d35f81b796c1d832eff74ca8a7a7544ef585a2722c1153fa9130f173edd7508,Tests_failed,d6fcf4f15523f9b500f9db700432c90c1d7f98da9f9246c75d097355ccbe74e6,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,0.014161825180053711,0.014272212982177734,0.015602588653564453,0.022774696350097656,0.014933586120605469,0.015428543090820312,0.014975547790527344,0.04386568069458008,0.06969738006591797,1.7412195205688477,0.4478633403778076,0.043196916580200195,0.0745847225189209,0.04272651672363281,0.0744466781616211,0.07802772521972656,0.07189726829528809,0.07342410087585449,0.07211613655090332,0.07409143447875977,0.07073760032653809,0.0718080997467041,0.07389569282531738,0.10952901840209961,0.1038045883178711,1.8520593643188477,0.5020449161529541,0.07127952575683594,0.07182526588439941,0.07422924041748047,0.0723578929901123,0.07243204116821289 diff --git a/results/combined/merges_timed/tgac/miso-lims.csv b/results/combined/merges_timed/tgac/miso-lims.csv index 053444f23c..cbcb0605fd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,True,True,True,4,40,209.0,2,True,4,Tests_passed,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,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,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,9fc1cc8989062c2a520d0faf7749c09023aafa287063e1df2e9a5ecebfdcb6bd,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,0.05723285675048828,0.047110557556152344,0.06276941299438477,0.02982330322265625,0.047406673431396484,0.0583646297454834,0.0655519962310791,0.1997087001800537,0.0822145938873291,0.8062405586242676,0.5534849166870117,0.052018165588378906,0.08057117462158203,0.05106520652770996,0.08105659484863281,0.07994794845581055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,True,True,True,4,40,209.0,2,True,4,Tests_passed,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,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,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,9fc1cc8989062c2a520d0faf7749c09023aafa287063e1df2e9a5ecebfdcb6bd,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,Tests_passed,2ee4366de872d4bae299cac7fba870e18c7cd622af24e37dc22257026dd1a4ad,0.05723285675048828,0.047110557556152344,0.06276941299438477,0.02982330322265625,0.047406673431396484,0.0583646297454834,0.0655519962310791,0.1997087001800537,0.0822145938873291,0.8062405586242676,0.5534849166870117,0.052018165588378906,0.08057117462158203,0.05106520652770996,0.08105659484863281,0.07994794845581055,0.0755009651184082,0.07282853126525879,0.07895255088806152,0.07805633544921875,0.07787871360778809,0.08022308349609375,0.07974791526794434,0.12226557731628418,0.11127948760986328,0.817986249923706,0.6042778491973877,0.07525992393493652,0.07639312744140625,0.07574224472045898,0.07728934288024902,0.07456231117248535 diff --git a/results/combined/merges_timed/thealgorithms/java.csv b/results/combined/merges_timed/thealgorithms/java.csv index dd5dadac6f..eeacc5e2b8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,True,8,50,800,2,True,8,Tests_passed,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,True,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,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,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,b4297374db6d2830e17a3ee523d42082cf6493930332f1121a8d96b3bdc6426b,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,5730670d14f8cc77b1cce7e1625fe05ebe97e2a33fe7904cc20232318ed63201,Tests_failed,39e7f35116b4b9a035fa5ca7009bea72123fdbf408a628b58c74f9db0caa787a,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.01661086082458496,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.11980676651000977,0.752741813659668,0.7615702152252197,0.05989718437194824,0.044416189193725586,0.047049760818481445,0.047449350357055664,0.04703927040100098 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,True,8,50,800,2,True,8,Tests_passed,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,True,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,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,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,b4297374db6d2830e17a3ee523d42082cf6493930332f1121a8d96b3bdc6426b,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,5730670d14f8cc77b1cce7e1625fe05ebe97e2a33fe7904cc20232318ed63201,Tests_failed,39e7f35116b4b9a035fa5ca7009bea72123fdbf408a628b58c74f9db0caa787a,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.01661086082458496,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.11980676651000977,0.752741813659668,0.7615702152252197,0.05989718437194824,0.044416189193725586,0.047049760818481445,0.047449350357055664,0.04703927040100098,0.04464459419250488,0.04603171348571777,0.04636383056640625,0.046233415603637695,0.046356916427612305,0.04541158676147461,0.04581928253173828,0.09482407569885254,0.07749080657958984,0.7964208126068115,0.7882568836212158,0.0457460880279541,0.045836448669433594,0.045614004135131836,0.06126570701599121,0.04604697227478027 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 b938ba5031..341c56b024 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,True,13,52,534,193,True,203,Tests_passed,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,True,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,True,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,50953d3d312416299d57dfbf6c596b26e9918bf0e52b690c9b6b8fb79f85822a,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Tests_failed,1184b5050180d5d3bf7e361da946f8cad30c35110fa4b5f7d907d1eb6cc8d856,Merge_failed,77f353cbb432544bd2f50bac74446efb00c44146d19d2caf8aad7bb25ce44891,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Merge_failed,983d099620f1c1246018436f8b8ebfcfa94511305117a7770f45bac45b258889,Tests_failed,4410815f04f6c9dbd7bfef7ff738a661a6e047212f6e63a323351edd458b15ba,Tests_passed,4a52be73622e7798941b0374493bc9ef92f5052c9fb717cd1bac190654a8e55c,Tests_failed,2f4c7af7f8d7d3d1579d16fca61ef66debe718167435895434718fdea2d906ad,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,0.04725289344787598,0.03384852409362793,0.046283721923828125,0.02006363868713379,0.04184842109680176,0.031975746154785156,0.045328617095947266,0.47111988067626953,0.4185802936553955,2.903336763381958,1.3000049591064453,0.045426130294799805,0.10809469223022461,0.050374746322631836,0.11286163330078125,0.11462855339050293 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,True,13,52,534,193,True,203,Tests_passed,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,True,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,True,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,50953d3d312416299d57dfbf6c596b26e9918bf0e52b690c9b6b8fb79f85822a,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Tests_failed,1184b5050180d5d3bf7e361da946f8cad30c35110fa4b5f7d907d1eb6cc8d856,Merge_failed,77f353cbb432544bd2f50bac74446efb00c44146d19d2caf8aad7bb25ce44891,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Merge_failed,983d099620f1c1246018436f8b8ebfcfa94511305117a7770f45bac45b258889,Tests_failed,4410815f04f6c9dbd7bfef7ff738a661a6e047212f6e63a323351edd458b15ba,Tests_passed,4a52be73622e7798941b0374493bc9ef92f5052c9fb717cd1bac190654a8e55c,Tests_failed,2f4c7af7f8d7d3d1579d16fca61ef66debe718167435895434718fdea2d906ad,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,ec89aea4313b9fd5704f99c05c673698904c46d8fe626f69a61d3fdcd60ea84f,Tests_passed,397cbb8512104f12d9d3f5233e97f070d1e0c3b643601edbf8e21c65a03b06de,0.04725289344787598,0.03384852409362793,0.046283721923828125,0.02006363868713379,0.04184842109680176,0.031975746154785156,0.045328617095947266,0.47111988067626953,0.4185802936553955,2.903336763381958,1.3000049591064453,0.045426130294799805,0.10809469223022461,0.050374746322631836,0.11286163330078125,0.11462855339050293,0.1240530014038086,0.1224207878112793,0.12239742279052734,0.12384438514709473,0.12202119827270508,0.12220311164855957,0.12601113319396973,0.22423338890075684,0.278792142868042,3.3473620414733887,1.424433708190918,0.1237783432006836,0.12322688102722168,0.12408709526062012,0.12022900581359863,0.12551021575927734 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 ed805c6c52..c87f79d1e9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,True,7,28,456,2,True,7,Tests_passed,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,True,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,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,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,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,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,752a01db25bcda120c4e07007749552f2a6b5750e36a3115691c15906aaf484a,Tests_failed,f535d9c4fecba4e70bdd0ef52d30a2c6aa2195a93d15557f65f41c5ae8a9a849,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,0.05703020095825195,0.06425833702087402,0.06943655014038086,0.022739171981811523,0.0654900074005127,0.06991219520568848,0.06636595726013184,0.20519375801086426,0.12740421295166016,0.8734674453735352,0.34723544120788574,0.04408836364746094,0.07042336463928223,0.04312324523925781,0.07084918022155762,0.07009601593017578 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,True,7,28,456,2,True,7,Tests_passed,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,True,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,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,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,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,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,752a01db25bcda120c4e07007749552f2a6b5750e36a3115691c15906aaf484a,Tests_failed,f535d9c4fecba4e70bdd0ef52d30a2c6aa2195a93d15557f65f41c5ae8a9a849,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,0.05703020095825195,0.06425833702087402,0.06943655014038086,0.022739171981811523,0.0654900074005127,0.06991219520568848,0.06636595726013184,0.20519375801086426,0.12740421295166016,0.8734674453735352,0.34723544120788574,0.04408836364746094,0.07042336463928223,0.04312324523925781,0.07084918022155762,0.07009601593017578,0.07053279876708984,0.07126164436340332,0.07300019264221191,0.07260990142822266,0.07314205169677734,0.07270216941833496,0.07086420059204102,0.11245131492614746,0.10565066337585449,1.0908944606781006,0.42931437492370605,0.07165908813476562,0.06965780258178711,0.06871747970581055,0.06886100769042969,0.06986379623413086 diff --git a/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv b/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv index 768c89b86d..83d886ae9d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,True,True,Tests_passed,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,True,21,41,496,2,True,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,True,21,True,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,d542f3bf343081fd66267d4fb614e02725311c37563457de5dee1f880ae3004f,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Tests_failed,04c806debd70d435e5b6bc15b3af7ae276b4d00d3b74f25b608eb8ee0c7323af,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,2f1e4e2ca27ac3d52a955621e8ab0b4009ad3b7647d5955f356025c336d3da74,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,b5699a4a6cc30df451f018a764c565fd6036a032e4bcef5dbea325f0cbb27910,Tests_failed,e93304ddeffc48326811d8c4063af473a863a02defcc65de9974223e53528972,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,0.008947134017944336,0.008824825286865234,0.009146690368652344,0.013700008392333984,0.009183406829833984,0.009041309356689453,0.009010553359985352,0.03586435317993164,0.07046270370483398,0.603801965713501,0.37836194038391113,0.03929710388183594,0.041658878326416016,0.049925804138183594,0.052312374114990234,0.052759647369384766 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,True,True,Tests_passed,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,True,21,41,496,2,True,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,True,21,True,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,d542f3bf343081fd66267d4fb614e02725311c37563457de5dee1f880ae3004f,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Tests_failed,04c806debd70d435e5b6bc15b3af7ae276b4d00d3b74f25b608eb8ee0c7323af,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,2f1e4e2ca27ac3d52a955621e8ab0b4009ad3b7647d5955f356025c336d3da74,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,b5699a4a6cc30df451f018a764c565fd6036a032e4bcef5dbea325f0cbb27910,Tests_failed,e93304ddeffc48326811d8c4063af473a863a02defcc65de9974223e53528972,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,0.008947134017944336,0.008824825286865234,0.009146690368652344,0.013700008392333984,0.009183406829833984,0.009041309356689453,0.009010553359985352,0.03586435317993164,0.07046270370483398,0.603801965713501,0.37836194038391113,0.03929710388183594,0.041658878326416016,0.049925804138183594,0.052312374114990234,0.052759647369384766,0.05307888984680176,0.052593231201171875,0.05132174491882324,0.04767894744873047,0.05072140693664551,0.04997372627258301,0.05123448371887207,0.08125591278076172,0.08265066146850586,0.612281084060669,0.43174052238464355,0.05101275444030762,0.05060553550720215,0.0507509708404541,0.05097818374633789,0.05136895179748535 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 862d00ab90..9b122d675b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,True,True,Tests_passed,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,True,13,52,159,2,True,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,True,13,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,2dcb801ab82596fcc1e662c5594a3afba3770b10e1da5f65d02bffe533f1ae34,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,c0241e29ef33b51142fe3c5313f067d7a60f5e0b5f4bad0cb58cd4e22e9c610b,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,9790bab53c9cae2f925eed8c30abc8ce645bf12c72a1f6e49467d2bee21d5541,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,0.032804250717163086,0.04710817337036133,0.04077005386352539,0.026273250579833984,0.02958202362060547,0.028903961181640625,0.05150794982910156,0.1609952449798584,0.1306319236755371,0.6017105579376221,-1.0,0.05513286590576172,0.052683115005493164,0.050432682037353516,0.051785945892333984,0.05238986015319824 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,True,True,Tests_passed,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,True,13,52,159,2,True,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,True,13,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,2dcb801ab82596fcc1e662c5594a3afba3770b10e1da5f65d02bffe533f1ae34,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,c0241e29ef33b51142fe3c5313f067d7a60f5e0b5f4bad0cb58cd4e22e9c610b,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,9790bab53c9cae2f925eed8c30abc8ce645bf12c72a1f6e49467d2bee21d5541,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,0.032804250717163086,0.04710817337036133,0.04077005386352539,0.026273250579833984,0.02958202362060547,0.028903961181640625,0.05150794982910156,0.1609952449798584,0.1306319236755371,0.6017105579376221,-1.0,0.05513286590576172,0.052683115005493164,0.050432682037353516,0.051785945892333984,0.05238986015319824,0.05274534225463867,0.05422711372375488,0.054128408432006836,0.057190895080566406,0.055563926696777344,0.05587577819824219,0.05559730529785156,0.08981537818908691,0.10396313667297363,0.6769375801086426,-1.0,0.05126166343688965,0.05359482765197754,0.05292797088623047,0.05121779441833496,0.05462837219238281 diff --git a/results/combined/merges_timed/theupswell/appengine-counter.csv b/results/combined/merges_timed/theupswell/appengine-counter.csv index f06624381d..feb0fa518f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,True,17,163,1959,4,True,17,Tests_passed,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,True,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,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,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,5b89dc64f2906bfb679aad05d6caff9673c249dcf904f1274d936735d3647dfc,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,0.01147150993347168,0.012592792510986328,0.012764930725097656,0.020189285278320312,0.012677907943725586,0.012376785278320312,0.012668132781982422,0.05925273895263672,0.11979484558105469,2.0322532653808594,0.5854220390319824,0.04380989074707031,0.0972590446472168,0.043103933334350586,0.09268522262573242,0.09250330924987793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,True,17,163,1959,4,True,17,Tests_passed,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,True,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,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,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,5b89dc64f2906bfb679aad05d6caff9673c249dcf904f1274d936735d3647dfc,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,0.01147150993347168,0.012592792510986328,0.012764930725097656,0.020189285278320312,0.012677907943725586,0.012376785278320312,0.012668132781982422,0.05925273895263672,0.11979484558105469,2.0322532653808594,0.5854220390319824,0.04380989074707031,0.0972590446472168,0.043103933334350586,0.09268522262573242,0.09250330924987793,0.09278750419616699,0.09459257125854492,0.0930929183959961,0.09473133087158203,0.09374785423278809,0.09221601486206055,0.0942227840423584,0.15474224090576172,0.15226197242736816,2.4016807079315186,0.774813175201416,0.09120035171508789,0.09190130233764648,0.09207725524902344,0.09299945831298828,0.09566545486450195 diff --git a/results/combined/merges_timed/thinkgem/jeesite.csv b/results/combined/merges_timed/thinkgem/jeesite.csv index 165e8b58d4..9ada9bd1a2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,False,True,2,1,9.0,22,True,22,Tests_passed,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,True,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,7d05465876882ccee8f1bd696c197791bd1d0059d8ecee1da4e29dfe131e11b4,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Tests_failed,838dc6abf572c3b4e79cf4fe67d72599337483e312725a7f58b05ec291532684,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.02260875701904297,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.13468718528747559,1.0537712574005127,0.5787553787231445,0.04984688758850098,0.04909777641296387,0.04975104331970215,0.05203652381896973,0.05217862129211426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,False,True,2,1,9.0,22,True,22,Tests_passed,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,True,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,7d05465876882ccee8f1bd696c197791bd1d0059d8ecee1da4e29dfe131e11b4,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Tests_failed,838dc6abf572c3b4e79cf4fe67d72599337483e312725a7f58b05ec291532684,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.02260875701904297,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.13468718528747559,1.0537712574005127,0.5787553787231445,0.04984688758850098,0.04909777641296387,0.04975104331970215,0.05203652381896973,0.05217862129211426,0.04980897903442383,0.04987454414367676,0.05066823959350586,0.04996085166931152,0.04946327209472656,0.0500638484954834,0.05019855499267578,0.08808255195617676,0.08874678611755371,1.0332486629486084,0.6046004295349121,0.04983377456665039,0.04942059516906738,0.04901432991027832,0.04729342460632324,0.048807621002197266 diff --git a/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv b/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv index 804bf9e7c9..5577890244 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,False,True,14.0,10,69.0,2,True,14,Tests_passed,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,True,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,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,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,23137b39201f7bd6afd8cd9f2ce1829945c098470f0e5e821d3c9c01f472de4c,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,0.055756330490112305,0.056215763092041016,0.07534575462341309,0.0906522274017334,0.08039331436157227,0.0699605941772461,0.07189488410949707,0.14732003211975098,0.10773420333862305,1.039766550064087,0.4244227409362793,0.12425541877746582,0.15879416465759277,0.12247323989868164,0.1588125228881836,0.1500992774963379 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,False,True,14.0,10,69.0,2,True,14,Tests_passed,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,True,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,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,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,23137b39201f7bd6afd8cd9f2ce1829945c098470f0e5e821d3c9c01f472de4c,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,Tests_passed,24b15d0578fe051dc331bce4d31e7127014a693a1430a3b108702178e675079e,0.055756330490112305,0.056215763092041016,0.07534575462341309,0.0906522274017334,0.08039331436157227,0.0699605941772461,0.07189488410949707,0.14732003211975098,0.10773420333862305,1.039766550064087,0.4244227409362793,0.12425541877746582,0.15879416465759277,0.12247323989868164,0.1588125228881836,0.1500992774963379,0.1406259536743164,0.1450669765472412,0.16595697402954102,0.1609358787536621,0.1742994785308838,0.1648249626159668,0.16652154922485352,0.22459077835083008,0.1996760368347168,1.1220858097076416,0.47210264205932617,0.15032124519348145,0.1469254493713379,0.14157843589782715,0.14187359809875488,0.14659500122070312 diff --git a/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv b/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv index 50a3ab8059..b053fa15b9 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,True,False,Tests_passed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,True,5,5,39,2,True,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,True,5,True,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_timedout,,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,0.0396115779876709,0.04133439064025879,0.0396575927734375,0.012524127960205078,0.040308475494384766,0.03750729560852051,0.04199624061584473,0.15165162086486816,0.11079645156860352,0.558215856552124,-1.0,0.0321192741394043,0.033406734466552734,0.031156301498413086,0.03361845016479492,0.03376626968383789 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,True,False,Tests_passed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,True,5,5,39,2,True,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,True,5,True,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_timedout,,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,0.0396115779876709,0.04133439064025879,0.0396575927734375,0.012524127960205078,0.040308475494384766,0.03750729560852051,0.04199624061584473,0.15165162086486816,0.11079645156860352,0.558215856552124,-1.0,0.0321192741394043,0.033406734466552734,0.031156301498413086,0.03361845016479492,0.03376626968383789,0.03196263313293457,0.03165721893310547,0.03203940391540527,0.0315093994140625,0.03200721740722656,0.032150983810424805,0.03234076499938965,0.06502509117126465,0.06392669677734375,0.5665755271911621,-1.0,0.032858848571777344,0.0318295955657959,0.03180241584777832,0.03194308280944824,0.031098365783691406 diff --git a/results/combined/merges_timed/thoqbk/traprange.csv b/results/combined/merges_timed/thoqbk/traprange.csv index 2c3d4566f0..1089df4a9b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,True,True,Tests_passed,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,True,19,88,1466.0,3,True,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,True,19,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,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,6a916e53335132d62965d08bad7af2d0c65cd2dbcf36656c4641520c3bce8595,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,ab3af7142cf717f4619d92dfa1cc1c29ba748e6ed2c5eb8cb65e4cf555bdb371,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,d21bda8e50712ec76d56d77633111c8755f688d3652c78aa8e4a028f608d0053,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,0.11645388603210449,0.11516046524047852,0.12140059471130371,0.15062856674194336,0.1390094757080078,0.12848901748657227,0.14404916763305664,0.25577735900878906,0.23910236358642578,1.195561170578003,0.7104277610778809,0.16426301002502441,0.2108323574066162,0.15763568878173828,0.1984388828277588,0.18448233604431152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,True,True,Tests_passed,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,True,19,88,1466.0,3,True,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,True,19,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,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,6a916e53335132d62965d08bad7af2d0c65cd2dbcf36656c4641520c3bce8595,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,ab3af7142cf717f4619d92dfa1cc1c29ba748e6ed2c5eb8cb65e4cf555bdb371,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,d21bda8e50712ec76d56d77633111c8755f688d3652c78aa8e4a028f608d0053,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,0.11645388603210449,0.11516046524047852,0.12140059471130371,0.15062856674194336,0.1390094757080078,0.12848901748657227,0.14404916763305664,0.25577735900878906,0.23910236358642578,1.195561170578003,0.7104277610778809,0.16426301002502441,0.2108323574066162,0.15763568878173828,0.1984388828277588,0.18448233604431152,0.20583605766296387,0.20509767532348633,0.23876118659973145,0.20578241348266602,0.23444414138793945,0.2360537052154541,0.20513558387756348,0.2970876693725586,0.29898667335510254,1.4456400871276855,0.8838605880737305,0.1799609661102295,0.21123290061950684,0.18276643753051758,0.20751047134399414,0.17917990684509277 diff --git a/results/combined/merges_timed/threerings/getdown.csv b/results/combined/merges_timed/threerings/getdown.csv index 6d686a78df..d5b26859d6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -94,refs/remotes/origin/pull/213,4120f253744b1f47df06c1b5b92d0edc41bd49d1,095d59ceea407e5c8c04f67fa224892f2b00fe88,76a6401d82c1bcf87492ade2d26e685172de8f0b,,True,True,True,22,208,1071.0,2,True,22,Tests_passed,530ab90e332d56829d168b6fa0ea91572280b96bb682313256027cf1c1ecb074,True,Tests_passed,e208343337674743ff1ae4811bb7cb3cb430c4772486fa7f0c74380b20f0b4e2,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,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_failed,7fa994644b55270eb7c24ca53e5257d17c78dfe1f7b42b25fff175374a282ca4,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,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,9c511727c22531506f59d7c0fe9e45bce844a4816ee99a113232a9181e58af8a,Tests_failed,7fa994644b55270eb7c24ca53e5257d17c78dfe1f7b42b25fff175374a282ca4,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,0.061486005783081055,0.05655550956726074,0.05259966850280762,0.024523258209228516,0.05902838706970215,0.052060842514038086,0.06271147727966309,0.21150875091552734,0.12158417701721191,1.5057730674743652,0.8130438327789307,0.04827761650085449,0.07393026351928711,0.04606986045837402,0.07489705085754395,0.06982564926147461 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +94,refs/remotes/origin/pull/213,4120f253744b1f47df06c1b5b92d0edc41bd49d1,095d59ceea407e5c8c04f67fa224892f2b00fe88,76a6401d82c1bcf87492ade2d26e685172de8f0b,,True,True,True,22,208,1071.0,2,True,22,Tests_passed,530ab90e332d56829d168b6fa0ea91572280b96bb682313256027cf1c1ecb074,True,Tests_passed,e208343337674743ff1ae4811bb7cb3cb430c4772486fa7f0c74380b20f0b4e2,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,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_failed,7fa994644b55270eb7c24ca53e5257d17c78dfe1f7b42b25fff175374a282ca4,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,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,9c511727c22531506f59d7c0fe9e45bce844a4816ee99a113232a9181e58af8a,Tests_failed,7fa994644b55270eb7c24ca53e5257d17c78dfe1f7b42b25fff175374a282ca4,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,0.061486005783081055,0.05655550956726074,0.05259966850280762,0.024523258209228516,0.05902838706970215,0.052060842514038086,0.06271147727966309,0.21150875091552734,0.12158417701721191,1.5057730674743652,0.8130438327789307,0.04827761650085449,0.07393026351928711,0.04606986045837402,0.07489705085754395,0.06982564926147461,0.07254958152770996,0.07135343551635742,0.0713958740234375,0.07369375228881836,0.0783686637878418,0.07617688179016113,0.07373881340026855,0.10950827598571777,0.10869026184082031,1.4618463516235352,0.8152844905853271,0.07092571258544922,0.07308435440063477,0.06829524040222168,0.07082438468933105,0.07337808609008789 diff --git a/results/combined/merges_timed/threeten/threeten-extra.csv b/results/combined/merges_timed/threeten/threeten-extra.csv index b48e3c3a46..604e4a6fdc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,False,True,10,27,235,2,True,10,Tests_passed,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,True,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,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_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,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,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,0.05016446113586426,0.05155754089355469,0.06448936462402344,0.02182292938232422,0.04949069023132324,0.015114068984985352,0.018814802169799805,0.16316008567810059,0.11509156227111816,0.06695747375488281,0.6394195556640625,0.13840985298156738,0.1539626121520996,0.12230777740478516,0.07866954803466797,0.1572723388671875 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,False,True,10,27,235,2,True,10,Tests_passed,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,True,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,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_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,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,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,0.05016446113586426,0.05155754089355469,0.06448936462402344,0.02182292938232422,0.04949069023132324,0.015114068984985352,0.018814802169799805,0.16316008567810059,0.11509156227111816,0.06695747375488281,0.6394195556640625,0.13840985298156738,0.1539626121520996,0.12230777740478516,0.07866954803466797,0.1572723388671875,0.06878662109375,0.1523725986480713,0.16353201866149902,0.06778216361999512,0.16439104080200195,0.16328644752502441,0.16532301902770996,0.1057119369506836,0.19249296188354492,0.18767118453979492,0.686908483505249,0.1533803939819336,0.1564018726348877,0.15100383758544922,0.06771588325500488,0.15471625328063965 diff --git a/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv b/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv index bd70e35592..f62a942137 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,True,True,True,24,91,472,11,True,29,Tests_passed,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,True,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,True,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,03cad3ba7bd5bcfcbef1e1af5cce620cd4be49dff444c1c25026294b270ef756,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,447a58356d80878a00e871d5486ff0cdb64cc168379a1f8f78081315e77eb8c7,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,ff2a9b40bfe798a8d379444526591dcc0e65ae25a9a669ae7cc82002cf13a493,Merge_failed,acf303ff8e010b48771db8e5bf2ea1f81835f90a5091f698e0725095e5b82608,Merge_failed,7072b19a7c314dc0b9f9e3a05fa35f91c2e63d821893cf550ac9f1a4a2228279,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,0.015668153762817383,0.015673160552978516,0.016704559326171875,0.024712324142456055,0.01669788360595703,0.01659369468688965,0.016273975372314453,0.1132814884185791,0.4038982391357422,3.0706772804260254,0.48837876319885254,0.06762337684631348,0.14663481712341309,0.0689551830291748,0.14922165870666504,0.1486039161682129 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,True,True,True,24,91,472,11,True,29,Tests_passed,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,True,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,True,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,03cad3ba7bd5bcfcbef1e1af5cce620cd4be49dff444c1c25026294b270ef756,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,447a58356d80878a00e871d5486ff0cdb64cc168379a1f8f78081315e77eb8c7,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,be0ac21602b8b7f51fa29ef9c16efb24b9d4ece57eef756fb6f0ef5b5fbfeb47,Merge_failed,ff2a9b40bfe798a8d379444526591dcc0e65ae25a9a669ae7cc82002cf13a493,Merge_failed,acf303ff8e010b48771db8e5bf2ea1f81835f90a5091f698e0725095e5b82608,Merge_failed,7072b19a7c314dc0b9f9e3a05fa35f91c2e63d821893cf550ac9f1a4a2228279,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,33b25dba7a3835fcd21d7788b02c07cd6947c7a10f4ca406b234c365028083e7,Merge_failed,6c892ec11dda7bb99cee1392ff0f54298d968276cffd89cbaadc40f1443c7e67,0.015668153762817383,0.015673160552978516,0.016704559326171875,0.024712324142456055,0.01669788360595703,0.01659369468688965,0.016273975372314453,0.1132814884185791,0.4038982391357422,3.0706772804260254,0.48837876319885254,0.06762337684631348,0.14663481712341309,0.0689551830291748,0.14922165870666504,0.1486039161682129,0.139876127243042,0.1424729824066162,0.1405935287475586,0.1388089656829834,0.14113903045654297,0.1394655704498291,0.13844752311706543,0.26809167861938477,0.3312644958496094,3.235576629638672,0.6233563423156738,0.13936448097229004,0.1358654499053955,0.14155149459838867,0.1389756202697754,0.1405801773071289 diff --git a/results/combined/merges_timed/timroes/axmlrpc.csv b/results/combined/merges_timed/timroes/axmlrpc.csv index 9bcb362ffc..b148be7241 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,True,10,23,107,3,True,10,Tests_passed,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,True,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,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,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,8110bb26601f1b0409b0a0404185446952642bf8beac82351f5264dd4618f1df,Tests_failed,6fe0f4bb47632c5907ac36b6b9be13afa05aa921c091ac845a9d885d11b9385a,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,0.010595083236694336,0.010419130325317383,0.010778188705444336,0.018708229064941406,0.010905265808105469,0.010598421096801758,0.011379718780517578,0.047914743423461914,0.1178581714630127,1.3165383338928223,0.37392687797546387,0.034241437911987305,0.07721233367919922,0.034600019454956055,0.07895779609680176,0.07962751388549805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,True,10,23,107,3,True,10,Tests_passed,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,True,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,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,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,8110bb26601f1b0409b0a0404185446952642bf8beac82351f5264dd4618f1df,Tests_failed,6fe0f4bb47632c5907ac36b6b9be13afa05aa921c091ac845a9d885d11b9385a,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3e32db7daf11ec814e01e2323b86fe3246118e1e4939557ba384ada20b6646cb,Tests_passed,3a6c4302b030fcb4698a838e0b9281840799c61a7305d928e2f79d6728ef2249,0.010595083236694336,0.010419130325317383,0.010778188705444336,0.018708229064941406,0.010905265808105469,0.010598421096801758,0.011379718780517578,0.047914743423461914,0.1178581714630127,1.3165383338928223,0.37392687797546387,0.034241437911987305,0.07721233367919922,0.034600019454956055,0.07895779609680176,0.07962751388549805,0.0745089054107666,0.07805466651916504,0.07407808303833008,0.07730674743652344,0.07557010650634766,0.07482099533081055,0.07679486274719238,0.12501049041748047,0.12895631790161133,1.4123399257659912,0.4009077548980713,0.07477807998657227,0.07492280006408691,0.07615470886230469,0.07424354553222656,0.07707500457763672 diff --git a/results/combined/merges_timed/tipsy/javalin.csv b/results/combined/merges_timed/tipsy/javalin.csv index 5a5095c543..c373b46208 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,True,True,True,52,209,1328.0,4,True,52,Tests_passed,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,True,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,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,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Tests_passed,c1849f1e836a58b4d47022f75dd1f61146eb3b6cda97c26fa166287d184f3c1c,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,24458d8291ed0e29f480ce10c7add4d78d0a6055a1bd3409257357fb77935020,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,d73b9ac66e35899728692bd5cfec6b32e751c5e2c09809571a78f0e221dfbff7,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.02406907081604004,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.2360239028930664,0.6348621845245361,0.3718280792236328,0.0613551139831543,0.09044265747070312,0.050168752670288086,0.09368133544921875,0.09276270866394043 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,True,True,True,52,209,1328.0,4,True,52,Tests_passed,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,True,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,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,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Tests_passed,c1849f1e836a58b4d47022f75dd1f61146eb3b6cda97c26fa166287d184f3c1c,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,24458d8291ed0e29f480ce10c7add4d78d0a6055a1bd3409257357fb77935020,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,d73b9ac66e35899728692bd5cfec6b32e751c5e2c09809571a78f0e221dfbff7,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.02406907081604004,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.2360239028930664,0.6348621845245361,0.3718280792236328,0.0613551139831543,0.09044265747070312,0.050168752670288086,0.09368133544921875,0.09276270866394043,0.09007954597473145,0.0903933048248291,0.09104561805725098,0.08890295028686523,0.09138751029968262,0.09135317802429199,0.09088420867919922,0.15549588203430176,0.17150235176086426,0.694699764251709,0.4614980220794678,0.10558271408081055,0.10396122932434082,0.1047673225402832,0.1035776138305664,0.1035161018371582 diff --git a/results/combined/merges_timed/titokone/titokone.csv b/results/combined/merges_timed/titokone/titokone.csv index a5e5815784..2b75dd4cf6 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,True,True,Tests_passed,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,True,60,539,2631.0,2,True,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,True,60,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,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,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,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,0.05215144157409668,0.029134750366210938,0.062140703201293945,0.02620387077331543,0.04490971565246582,0.039763450622558594,0.05616950988769531,0.17666912078857422,0.13451004028320312,0.04860234260559082,1.387143611907959,0.05185961723327637,0.08012866973876953,0.07081317901611328,0.1016693115234375,0.07714200019836426 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,True,True,Tests_passed,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,True,60,539,2631.0,2,True,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,True,60,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,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,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,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,0.05215144157409668,0.029134750366210938,0.062140703201293945,0.02620387077331543,0.04490971565246582,0.039763450622558594,0.05616950988769531,0.17666912078857422,0.13451004028320312,0.04860234260559082,1.387143611907959,0.05185961723327637,0.08012866973876953,0.07081317901611328,0.1016693115234375,0.07714200019836426,0.09682011604309082,0.09239840507507324,0.07399559020996094,0.07836079597473145,0.1073155403137207,0.10715961456298828,0.0933072566986084,0.11363601684570312,0.13961315155029297,0.09151530265808105,1.4123759269714355,0.09871053695678711,0.09922003746032715,0.08612060546875,0.07093286514282227,0.075439453125 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 c2e28b6ab8..2916af045c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,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,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,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,0873103770310e66b215c3493c7b0d7867edac12312539637d0e74a15e4261e3,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,0.044940948486328125,0.047214508056640625,0.043787479400634766,0.015486478805541992,0.045101165771484375,0.04206228256225586,0.045850515365600586,0.1631019115447998,0.10330986976623535,1.031886100769043,0.29920148849487305,0.030760765075683594,0.05415654182434082,0.031245708465576172,0.054522037506103516,0.05632925033569336 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,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,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,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,0873103770310e66b215c3493c7b0d7867edac12312539637d0e74a15e4261e3,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,0.044940948486328125,0.047214508056640625,0.043787479400634766,0.015486478805541992,0.045101165771484375,0.04206228256225586,0.045850515365600586,0.1631019115447998,0.10330986976623535,1.031886100769043,0.29920148849487305,0.030760765075683594,0.05415654182434082,0.031245708465576172,0.054522037506103516,0.05632925033569336,0.055239200592041016,0.056229352951049805,0.05465507507324219,0.055763959884643555,0.05684328079223633,0.05522322654724121,0.05694389343261719,0.08963322639465332,0.09225964546203613,1.1636507511138916,0.37420177459716797,0.05529427528381348,0.05639457702636719,0.056411027908325195,0.05654096603393555,0.05633687973022461 diff --git a/results/combined/merges_timed/tntim96/jscover.csv b/results/combined/merges_timed/tntim96/jscover.csv index a0d949f074..4e124746fc 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,15,45,1706,2,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,15,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,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,0.015267610549926758,0.016220808029174805,0.016614675521850586,0.023246049880981445,0.0170745849609375,0.01710343360900879,0.017294883728027344,0.0468745231628418,0.07390689849853516,0.7279741764068604,0.5244240760803223,0.04297971725463867,0.07083344459533691,0.04324698448181152,0.07114362716674805,0.07128405570983887 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,15,45,1706,2,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,15,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,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,0.015267610549926758,0.016220808029174805,0.016614675521850586,0.023246049880981445,0.0170745849609375,0.01710343360900879,0.017294883728027344,0.0468745231628418,0.07390689849853516,0.7279741764068604,0.5244240760803223,0.04297971725463867,0.07083344459533691,0.04324698448181152,0.07114362716674805,0.07128405570983887,0.07079577445983887,0.06953787803649902,0.0700063705444336,0.06961274147033691,0.06834268569946289,0.0704340934753418,0.06929922103881836,0.106689453125,0.10193085670471191,0.7398059368133545,0.5484347343444824,0.07089519500732422,0.0706484317779541,0.06913495063781738,0.06848692893981934,0.06740713119506836 diff --git a/results/combined/merges_timed/tomitribe/crest.csv b/results/combined/merges_timed/tomitribe/crest.csv index 6d84bfab9d..c500fb9b28 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,False,True,16,24,91,2,True,16,Tests_passed,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,True,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,True,Tests_timedout,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.056478023529052734,0.05665254592895508,0.05809903144836426,0.01957535743713379,0.048818349838256836,0.04215812683105469,0.0450441837310791,0.18069243431091309,0.0968177318572998,1.6507484912872314,0.5622682571411133,0.039160966873168945,0.08257436752319336,0.04137897491455078,0.06607556343078613,0.07611584663391113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,False,True,16,24,91,2,True,16,Tests_passed,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,True,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,True,Tests_timedout,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.056478023529052734,0.05665254592895508,0.05809903144836426,0.01957535743713379,0.048818349838256836,0.04215812683105469,0.0450441837310791,0.18069243431091309,0.0968177318572998,1.6507484912872314,0.5622682571411133,0.039160966873168945,0.08257436752319336,0.04137897491455078,0.06607556343078613,0.07611584663391113,0.06671857833862305,0.0680999755859375,0.06899094581604004,0.07606649398803711,0.08398270606994629,0.08770155906677246,0.08598756790161133,0.12836718559265137,0.12274289131164551,1.8602616786956787,0.6617364883422852,0.079620361328125,0.08234667778015137,0.08218979835510254,0.08072209358215332,0.0666494369506836 diff --git a/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv b/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv index f988ae5188..d75ceff1b9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,True,8,21,217.0,2,True,8,Tests_passed,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,True,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,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,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,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,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,aaceda016884d04573ae09bf4651bf0a640e573e1acd7cdddfb217478f37fc65,Tests_failed,e367150b8f7e37e6ba22e7b5afa00797dba6c4b74734b1bc67392d610c8935b0,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,0.056017160415649414,0.03256058692932129,0.057526588439941406,0.018887042999267578,0.05842900276184082,0.05703425407409668,0.051679134368896484,0.19242477416992188,0.11243128776550293,0.8196380138397217,0.4030790328979492,0.04288196563720703,0.0685415267944336,0.0429081916809082,0.06717109680175781,0.06845712661743164 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,True,8,21,217.0,2,True,8,Tests_passed,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,True,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,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,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,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,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,aaceda016884d04573ae09bf4651bf0a640e573e1acd7cdddfb217478f37fc65,Tests_failed,e367150b8f7e37e6ba22e7b5afa00797dba6c4b74734b1bc67392d610c8935b0,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,0.056017160415649414,0.03256058692932129,0.057526588439941406,0.018887042999267578,0.05842900276184082,0.05703425407409668,0.051679134368896484,0.19242477416992188,0.11243128776550293,0.8196380138397217,0.4030790328979492,0.04288196563720703,0.0685415267944336,0.0429081916809082,0.06717109680175781,0.06845712661743164,0.0641472339630127,0.06495261192321777,0.0660092830657959,0.06558918952941895,0.06700468063354492,0.06736207008361816,0.06792807579040527,0.10242486000061035,0.09818458557128906,0.8378627300262451,0.4404158592224121,0.06506013870239258,0.06492280960083008,0.06314539909362793,0.06491780281066895,0.0644674301147461 diff --git a/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv b/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv index f7662a69aa..932d4d195a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,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,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,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,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,8130f15970ed210edf8da751972b9fc09e871c8d3be675f0d45cd560f6c9aa37,Tests_failed,d526197e01bb2bb7e4c0330c38b56a280a12e1829732edc9efe1bc9c7a90228d,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.016152620315551758,0.016547441482543945,0.02034473419189453,0.015805721282958984,0.01977062225341797,0.020272016525268555,0.020308732986450195,0.04810905456542969,0.07109308242797852,1.2589967250823975,0.40744805335998535,0.048139333724975586,0.08225083351135254,0.050112247467041016,0.07909417152404785,0.06269431114196777 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,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,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,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,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,8130f15970ed210edf8da751972b9fc09e871c8d3be675f0d45cd560f6c9aa37,Tests_failed,d526197e01bb2bb7e4c0330c38b56a280a12e1829732edc9efe1bc9c7a90228d,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.016152620315551758,0.016547441482543945,0.02034473419189453,0.015805721282958984,0.01977062225341797,0.020272016525268555,0.020308732986450195,0.04810905456542969,0.07109308242797852,1.2589967250823975,0.40744805335998535,0.048139333724975586,0.08225083351135254,0.050112247467041016,0.07909417152404785,0.06269431114196777,0.08004260063171387,0.06075549125671387,0.08278942108154297,0.07602715492248535,0.0860288143157959,0.08286714553833008,0.0851602554321289,0.12258148193359375,0.11900877952575684,1.653857946395874,0.4674384593963623,0.07815718650817871,0.07838702201843262,0.08243179321289062,0.06173539161682129,0.07673525810241699 diff --git a/results/combined/merges_timed/tpietzsch/spimviewer.csv b/results/combined/merges_timed/tpietzsch/spimviewer.csv index 35ed67e8ae..ff5a53b989 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,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,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,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,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,8130f15970ed210edf8da751972b9fc09e871c8d3be675f0d45cd560f6c9aa37,Tests_failed,d526197e01bb2bb7e4c0330c38b56a280a12e1829732edc9efe1bc9c7a90228d,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.01582169532775879,0.016814470291137695,0.019854307174682617,0.0158693790435791,0.01968860626220703,0.020383596420288086,0.019805431365966797,0.048204898834228516,0.0720665454864502,1.2331314086914062,0.40624022483825684,0.051435232162475586,0.08070135116577148,0.05130720138549805,0.06651067733764648,0.07507610321044922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,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,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,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,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,8130f15970ed210edf8da751972b9fc09e871c8d3be675f0d45cd560f6c9aa37,Tests_failed,d526197e01bb2bb7e4c0330c38b56a280a12e1829732edc9efe1bc9c7a90228d,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.01582169532775879,0.016814470291137695,0.019854307174682617,0.0158693790435791,0.01968860626220703,0.020383596420288086,0.019805431365966797,0.048204898834228516,0.0720665454864502,1.2331314086914062,0.40624022483825684,0.051435232162475586,0.08070135116577148,0.05130720138549805,0.06651067733764648,0.07507610321044922,0.07957625389099121,0.07805013656616211,0.08379721641540527,0.07767343521118164,0.06371879577636719,0.08005118370056152,0.08078908920288086,0.12473368644714355,0.10732865333557129,1.3114023208618164,0.4403109550476074,0.08002972602844238,0.07747125625610352,0.07753586769104004,0.06050825119018555,0.0782465934753418 diff --git a/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv b/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv index 41275846ac..f79d239057 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,True,3,21,97,2,True,3,Tests_passed,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,True,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,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,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,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_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,3aaafc15b9c7bffb6ff627cdc8b41c05ea3b7bff5a84073d241d84cb6e9c2849,Tests_failed,79835446010b86dc3c8b6127e8000402e613b57607a978ededa54bc1641c200e,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,0.009611368179321289,0.009708881378173828,0.009871244430541992,0.014923572540283203,0.009908437728881836,0.009857654571533203,0.009978055953979492,0.03478264808654785,0.06551051139831543,0.7030458450317383,0.3504805564880371,0.03168511390686035,0.054352760314941406,0.03141975402832031,0.05342602729797363,0.05450725555419922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,True,3,21,97,2,True,3,Tests_passed,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,True,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,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,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,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_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,3aaafc15b9c7bffb6ff627cdc8b41c05ea3b7bff5a84073d241d84cb6e9c2849,Tests_failed,79835446010b86dc3c8b6127e8000402e613b57607a978ededa54bc1641c200e,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,0.009611368179321289,0.009708881378173828,0.009871244430541992,0.014923572540283203,0.009908437728881836,0.009857654571533203,0.009978055953979492,0.03478264808654785,0.06551051139831543,0.7030458450317383,0.3504805564880371,0.03168511390686035,0.054352760314941406,0.03141975402832031,0.05342602729797363,0.05450725555419922,0.05218863487243652,0.05194592475891113,0.05076098442077637,0.052623748779296875,0.053353071212768555,0.05302739143371582,0.05354499816894531,0.08470964431762695,0.08287668228149414,0.7054178714752197,0.37034010887145996,0.05334925651550293,0.052841901779174805,0.05298948287963867,0.05202031135559082,0.05274772644042969 diff --git a/results/combined/merges_timed/tracee/tracee.csv b/results/combined/merges_timed/tracee/tracee.csv index ec8efdf641..cfccb31091 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,True,53,224,1825,37,True,57,Tests_passed,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,True,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,True,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,a38b6a5d40456754b09574e65a89bc30473fa3059c02f3b99684f747f58a7bfd,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,b2041dce38fdbfba9529c8f60d8c46df461772fde57c17511f7e53760755fbf9,Merge_failed,03d4fcbef2fca41c95aafc2d2578f50b2dff62c03d765ebd090f000ac41c2892,Merge_failed,2a604513d5e86019a34eca1bbfc71afa1e558cf3bc6832e47d802b58dcedcca9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,e2dce24c45174a4a7b4ec71e5bd7d804c99a9302651668699c2601c49ab39d79,Merge_failed,a5f2fd94d69146b7eacb3f2eb21cf7a331cd4cddf06341a6127eb85fd16f072c,Merge_failed,a5f2fd94d69146b7eacb3f2eb21cf7a331cd4cddf06341a6127eb85fd16f072c,Merge_failed,da31d9607cf5e09c5bcd4bb7dcda687178e37c74679524420e1de5dd20498994,Merge_failed,2a3fab3947f4bb500ceac0f2845442da089bbf076552d1815b9acb1e2609a350,Merge_failed,516ebd85cb3e3ce6c9e3ef48d5b2476bd51c0a7e7b3421f495646cd76d4b4bdb,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,0.0675191879272461,0.07007503509521484,0.048508405685424805,0.02894139289855957,0.0733804702758789,0.04801583290100098,0.06391096115112305,2.10709285736084,1.990940809249878,0.045385122299194336,0.517815351486206,0.39882493019104004,0.5302884578704834,0.4127223491668701,0.8316481113433838,0.8209195137023926 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,True,53,224,1825,37,True,57,Tests_passed,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,True,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,True,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,a38b6a5d40456754b09574e65a89bc30473fa3059c02f3b99684f747f58a7bfd,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,b2041dce38fdbfba9529c8f60d8c46df461772fde57c17511f7e53760755fbf9,Merge_failed,03d4fcbef2fca41c95aafc2d2578f50b2dff62c03d765ebd090f000ac41c2892,Merge_failed,2a604513d5e86019a34eca1bbfc71afa1e558cf3bc6832e47d802b58dcedcca9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,e2dce24c45174a4a7b4ec71e5bd7d804c99a9302651668699c2601c49ab39d79,Merge_failed,a5f2fd94d69146b7eacb3f2eb21cf7a331cd4cddf06341a6127eb85fd16f072c,Merge_failed,a5f2fd94d69146b7eacb3f2eb21cf7a331cd4cddf06341a6127eb85fd16f072c,Merge_failed,da31d9607cf5e09c5bcd4bb7dcda687178e37c74679524420e1de5dd20498994,Merge_failed,2a3fab3947f4bb500ceac0f2845442da089bbf076552d1815b9acb1e2609a350,Merge_failed,516ebd85cb3e3ce6c9e3ef48d5b2476bd51c0a7e7b3421f495646cd76d4b4bdb,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,2707a6c9da4c4fafad1fe429dbf70b9d65e2b6f63917f6bdead51e9595ca1ee5,Merge_failed,d3e3dca7e77065914cf6fe1b25286ff8c68b76c5175ee4c6165417eee9f273a9,0.0675191879272461,0.07007503509521484,0.048508405685424805,0.02894139289855957,0.0733804702758789,0.04801583290100098,0.06391096115112305,2.10709285736084,1.990940809249878,0.045385122299194336,0.517815351486206,0.39882493019104004,0.5302884578704834,0.4127223491668701,0.8316481113433838,0.8209195137023926,0.8331186771392822,0.8256983757019043,0.8398900032043457,0.8211479187011719,0.8407208919525146,0.8408374786376953,0.8413848876953125,1.3668303489685059,1.7943034172058105,0.8643794059753418,1.4049947261810303,0.8485915660858154,0.8547244071960449,0.8469350337982178,0.8387823104858398,0.819242000579834 diff --git a/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv b/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv index bf3e3d8d1c..3918faa9c7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,True,False,Tests_passed,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,True,3,6,60,5,True,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,True,5,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,a7de7def47def04c383a986b3995fe6a74ef00f581c34a2886f4a26c3efad223,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Tests_failed,b12103bc467459b95674a2a1d35e196ef9830d683c4c62a7b7c336a43fa69605,Merge_failed,671d3bb133862f4a8dadfc1bbb9e3b49ec8ae8823d93c9651cfb81b91d62c4c8,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,0ef7351d5b0452708818b2dece7c65d658fbe142694ce7e99772f87e5ac86981,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,cd92109af70a82c62675ca421d7f649584f9bf4bebbbaf002fbc669a5d8167b5,Tests_failed,63abddc67a919605c5ff63adf71ff42b5bcb5aff0131c0f643a177123ba71ea5,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,0.03911447525024414,0.04003572463989258,0.037322998046875,0.012620687484741211,0.037674665451049805,0.03882622718811035,0.038288116455078125,0.21964478492736816,0.18127679824829102,1.1765682697296143,0.28589510917663574,0.03845548629760742,0.05949592590332031,0.039321184158325195,0.06116318702697754,0.060593366622924805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,True,False,Tests_passed,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,True,3,6,60,5,True,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,True,5,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,a7de7def47def04c383a986b3995fe6a74ef00f581c34a2886f4a26c3efad223,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Tests_failed,b12103bc467459b95674a2a1d35e196ef9830d683c4c62a7b7c336a43fa69605,Merge_failed,671d3bb133862f4a8dadfc1bbb9e3b49ec8ae8823d93c9651cfb81b91d62c4c8,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,0ef7351d5b0452708818b2dece7c65d658fbe142694ce7e99772f87e5ac86981,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,cd92109af70a82c62675ca421d7f649584f9bf4bebbbaf002fbc669a5d8167b5,Tests_failed,63abddc67a919605c5ff63adf71ff42b5bcb5aff0131c0f643a177123ba71ea5,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,0.03911447525024414,0.04003572463989258,0.037322998046875,0.012620687484741211,0.037674665451049805,0.03882622718811035,0.038288116455078125,0.21964478492736816,0.18127679824829102,1.1765682697296143,0.28589510917663574,0.03845548629760742,0.05949592590332031,0.039321184158325195,0.06116318702697754,0.060593366622924805,0.05641603469848633,0.05629110336303711,0.05547475814819336,0.0574193000793457,0.05691409111022949,0.05719113349914551,0.05500340461730957,0.10259199142456055,0.12784194946289062,1.243079662322998,0.3475954532623291,0.058492183685302734,0.06069660186767578,0.05848336219787598,0.056936025619506836,0.056476593017578125 diff --git a/results/combined/merges_timed/tridentsdk/tridentsdk.csv b/results/combined/merges_timed/tridentsdk/tridentsdk.csv index 3cdd4e7200..75bdf57de4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,ee3aa881260bc4158395adfd48b98ee0fc4569a076afdec880a4c83d89ec6e09,Merge_failed,6993c3ef798a42e596dee2de687394ff7e30b5d3a6b4a2943c0c662214b4b463,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,0.015267372131347656,0.01525259017944336,0.016328096389770508,0.023525714874267578,0.018965959548950195,0.015974044799804688,0.03414487838745117,0.1474616527557373,0.2797842025756836,1.624173879623413,0.36621594429016113,0.07651472091674805,0.07484292984008789,0.07792162895202637,0.0808107852935791,0.07993268966674805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,ee3aa881260bc4158395adfd48b98ee0fc4569a076afdec880a4c83d89ec6e09,Merge_failed,6993c3ef798a42e596dee2de687394ff7e30b5d3a6b4a2943c0c662214b4b463,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,Merge_failed,09132ddefaf44ceade037856bc4cb3702736ef81b32ae676fc43fe43f05a13ce,0.015267372131347656,0.01525259017944336,0.016328096389770508,0.023525714874267578,0.018965959548950195,0.015974044799804688,0.03414487838745117,0.1474616527557373,0.2797842025756836,1.624173879623413,0.36621594429016113,0.07651472091674805,0.07484292984008789,0.07792162895202637,0.0808107852935791,0.07993268966674805,0.07825922966003418,0.07857990264892578,0.0789480209350586,0.08109188079833984,0.07101893424987793,0.07914543151855469,0.07642674446105957,0.1561565399169922,0.19012117385864258,1.6735429763793945,0.44442248344421387,0.07808780670166016,0.0753483772277832,0.07933974266052246,0.07599353790283203,0.07481598854064941 diff --git a/results/combined/merges_timed/trung/inmemoryjavacompiler.csv b/results/combined/merges_timed/trung/inmemoryjavacompiler.csv index 7842958578..5a3b3ad4af 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,True,13,33,548,2,True,13,Tests_passed,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,True,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,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,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,02f3bc57b5a122ef443a7a9b65d245caae8b2ed83821b580267c5f5fc24c3d14,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,64df6d67217a4d6cdfca038cd39cb2d1384c50b27c3c26a69cc40519cd4dad33,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,0.03392291069030762,0.031009912490844727,0.03581714630126953,0.011997461318969727,0.03768277168273926,0.036516427993774414,0.0324857234954834,0.15687203407287598,0.11629796028137207,0.642298698425293,0.3793294429779053,0.037482261657714844,0.03813028335571289,0.044821977615356445,0.0582880973815918,0.047859907150268555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,True,13,33,548,2,True,13,Tests_passed,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,True,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,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,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,02f3bc57b5a122ef443a7a9b65d245caae8b2ed83821b580267c5f5fc24c3d14,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,64df6d67217a4d6cdfca038cd39cb2d1384c50b27c3c26a69cc40519cd4dad33,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,0.03392291069030762,0.031009912490844727,0.03581714630126953,0.011997461318969727,0.03768277168273926,0.036516427993774414,0.0324857234954834,0.15687203407287598,0.11629796028137207,0.642298698425293,0.3793294429779053,0.037482261657714844,0.03813028335571289,0.044821977615356445,0.0582880973815918,0.047859907150268555,0.0577702522277832,0.04940319061279297,0.05723237991333008,0.04878807067871094,0.058587074279785156,0.058933258056640625,0.05759906768798828,0.09163641929626465,0.09652900695800781,0.6825320720672607,0.4483506679534912,0.05961966514587402,0.057533979415893555,0.05914592742919922,0.05741286277770996,0.04803276062011719 diff --git a/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv b/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv index 82d263161d..07eabca139 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,True,6,15,400,2,True,6,Tests_passed,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,True,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,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,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Tests_failed,afb9daa7db495d06e62417076e81d9c81d0c41d2905d1406a36ccc23d268ce3d,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,cd7896bf6c157e80664953a6ce06bfa32432bbd3eb3a1e6063eda3d718733f50,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,3c6beabce556c1fd3629c1c543efac6930c194553b9be9e80f2db5e839c775f4,Tests_failed,4dbecea890dbd14252f60ffb055465d60aea593ea627dd24954691cc966e2fa8,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,0.014379739761352539,0.014288187026977539,0.015680789947509766,0.023700952529907227,0.015498638153076172,0.01593494415283203,0.0158994197845459,0.04353690147399902,0.0703427791595459,0.6736428737640381,0.44020509719848633,0.05379843711853027,0.05247831344604492,0.05091547966003418,0.0517573356628418,0.04969501495361328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,True,6,15,400,2,True,6,Tests_passed,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,True,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,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,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Tests_failed,afb9daa7db495d06e62417076e81d9c81d0c41d2905d1406a36ccc23d268ce3d,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,cd7896bf6c157e80664953a6ce06bfa32432bbd3eb3a1e6063eda3d718733f50,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,3c6beabce556c1fd3629c1c543efac6930c194553b9be9e80f2db5e839c775f4,Tests_failed,4dbecea890dbd14252f60ffb055465d60aea593ea627dd24954691cc966e2fa8,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,0.014379739761352539,0.014288187026977539,0.015680789947509766,0.023700952529907227,0.015498638153076172,0.01593494415283203,0.0158994197845459,0.04353690147399902,0.0703427791595459,0.6736428737640381,0.44020509719848633,0.05379843711853027,0.05247831344604492,0.05091547966003418,0.0517573356628418,0.04969501495361328,0.05280494689941406,0.054514408111572266,0.05327320098876953,0.05298018455505371,0.05538654327392578,0.05392599105834961,0.05358147621154785,0.08908748626708984,0.09074807167053223,0.8851311206817627,0.5267913341522217,0.05171990394592285,0.051003456115722656,0.05105304718017578,0.05521416664123535,0.053185462951660156 diff --git a/results/combined/merges_timed/tuck182/harmony-java-client.csv b/results/combined/merges_timed/tuck182/harmony-java-client.csv index d2a3485572..aada8a8c9e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,True,28,154,2324,8,True,29,Tests_passed,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,True,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,True,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,b70925fc078c93576c38aecd623833730c1c87abd73e8c5c821531b82344fe7e,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,Merge_failed,604d47661766b638a90761bf71ed93806627d8e9190a7da6fa18694bb0fcf554,Merge_failed,68d72774ea80e941be6b5f84c12aa2adae40efbc53d00492e2b0df2572e0c05d,Merge_failed,ca05cbfab10510492ef3be2bcaa3bf47f946e837c1d79b58285417360af673f7,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,4f2669c2e80b9a4da6c486695ebbb05540496f5e21705ea3c4f9dbb65022cd03,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,7735389da89511dee31a17b4c9b36d9e9f28a71cf60d45afaef9b10d0423b61f,Merge_failed,141c2bcbb9f9544fbc77377d0b6095b6e66530a38b61219c83b06a02205cd167,Merge_failed,e5ead0ae620a454c3e371ac5ef812c4a5a6b9ef515029bcb4f81bd7fb87f3e9d,Merge_failed,cb39d647d18f104a64e25c3d6400d76670d024b208631f342a965a3f8fe6b26a,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,0.010153770446777344,0.010296344757080078,0.010285377502441406,0.017084836959838867,0.010285615921020508,0.01027989387512207,0.010286569595336914,0.09299969673156738,0.3565390110015869,2.205512523651123,0.7684335708618164,0.09649181365966797,0.10457777976989746,0.09432053565979004,0.10523295402526855,0.10591840744018555 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,True,28,154,2324,8,True,29,Tests_passed,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,True,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,True,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,b70925fc078c93576c38aecd623833730c1c87abd73e8c5c821531b82344fe7e,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,Merge_failed,604d47661766b638a90761bf71ed93806627d8e9190a7da6fa18694bb0fcf554,Merge_failed,68d72774ea80e941be6b5f84c12aa2adae40efbc53d00492e2b0df2572e0c05d,Merge_failed,ca05cbfab10510492ef3be2bcaa3bf47f946e837c1d79b58285417360af673f7,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,4f2669c2e80b9a4da6c486695ebbb05540496f5e21705ea3c4f9dbb65022cd03,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,7735389da89511dee31a17b4c9b36d9e9f28a71cf60d45afaef9b10d0423b61f,Merge_failed,141c2bcbb9f9544fbc77377d0b6095b6e66530a38b61219c83b06a02205cd167,Merge_failed,e5ead0ae620a454c3e371ac5ef812c4a5a6b9ef515029bcb4f81bd7fb87f3e9d,Merge_failed,cb39d647d18f104a64e25c3d6400d76670d024b208631f342a965a3f8fe6b26a,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,0b085833d67ae2a8a2bf0fbd11ea597bebf2200eb6a98f896259e0a2c0ba0cf3,Merge_failed,d1f3146bc93ba74c4a146b27347d39a6c34cc2312e736e61f4627b221073a048,0.010153770446777344,0.010296344757080078,0.010285377502441406,0.017084836959838867,0.010285615921020508,0.01027989387512207,0.010286569595336914,0.09299969673156738,0.3565390110015869,2.205512523651123,0.7684335708618164,0.09649181365966797,0.10457777976989746,0.09432053565979004,0.10523295402526855,0.10591840744018555,0.10718727111816406,0.10485577583312988,0.10563850402832031,0.10682225227355957,0.10458731651306152,0.1049187183380127,0.10579276084899902,0.217116117477417,0.29572606086730957,2.6395809650421143,0.9270584583282471,0.10513114929199219,0.10499453544616699,0.10588431358337402,0.1065664291381836,0.10459375381469727 diff --git a/results/combined/merges_timed/tumblr/jumblr.csv b/results/combined/merges_timed/tumblr/jumblr.csv index b532afbee1..6a0c8f66e0 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -39,refs/remotes/origin/pull/18,7bd1a3a093ace02c2ebc38d3be82b32648347cc8,b6eceef13010039abfa0207b9414596c36b44232,560d193ec4b29a3a279a595dfe820c28c2d79572,,True,True,True,10,32,554,3,True,10,Tests_passed,9b4ca1edb7927cd6698f011538d47fd7e0d69ae74ffd94c58138fe6d452fd1d1,True,Tests_passed,dc26af4cb9ee9d74196fdf731bdcf20316a7e1cdee7034ec39d377f605393cec,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,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_failed,a86692b2a3abe7e9d01a75d0c8ad70aea17b3f02f78ebaaef5254199b5e8b563,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,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,f5c5ccb892407585294b14aea897f9fee5d8febf0c263ca0a89c867cd1c4f8b3,Tests_failed,a86692b2a3abe7e9d01a75d0c8ad70aea17b3f02f78ebaaef5254199b5e8b563,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,0.041060447692871094,0.04610133171081543,0.03771257400512695,0.01776576042175293,0.05413031578063965,0.05374455451965332,0.04127383232116699,0.050099849700927734,0.15685343742370605,0.8798577785491943,0.3348047733306885,0.03325366973876953,0.07694244384765625,0.03265690803527832,0.07754325866699219,0.07821226119995117 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +39,refs/remotes/origin/pull/18,7bd1a3a093ace02c2ebc38d3be82b32648347cc8,b6eceef13010039abfa0207b9414596c36b44232,560d193ec4b29a3a279a595dfe820c28c2d79572,,True,True,True,10,32,554,3,True,10,Tests_passed,9b4ca1edb7927cd6698f011538d47fd7e0d69ae74ffd94c58138fe6d452fd1d1,True,Tests_passed,dc26af4cb9ee9d74196fdf731bdcf20316a7e1cdee7034ec39d377f605393cec,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,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_failed,a86692b2a3abe7e9d01a75d0c8ad70aea17b3f02f78ebaaef5254199b5e8b563,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,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,f5c5ccb892407585294b14aea897f9fee5d8febf0c263ca0a89c867cd1c4f8b3,Tests_failed,a86692b2a3abe7e9d01a75d0c8ad70aea17b3f02f78ebaaef5254199b5e8b563,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,0.041060447692871094,0.04610133171081543,0.03771257400512695,0.01776576042175293,0.05413031578063965,0.05374455451965332,0.04127383232116699,0.050099849700927734,0.15685343742370605,0.8798577785491943,0.3348047733306885,0.03325366973876953,0.07694244384765625,0.03265690803527832,0.07754325866699219,0.07821226119995117,0.07287430763244629,0.07298612594604492,0.07288837432861328,0.07172060012817383,0.07229828834533691,0.07367467880249023,0.07397675514221191,0.12288308143615723,0.12670540809631348,0.9766223430633545,0.37111520767211914,0.07407379150390625,0.07497119903564453,0.07310104370117188,0.07340526580810547,0.07258033752441406 diff --git a/results/combined/merges_timed/tupilabs/tap4j.csv b/results/combined/merges_timed/tupilabs/tap4j.csv index 4a0bf7c07f..4a72054502 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,True,True,Tests_passed,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,True,2,10,48,2,True,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,True,2,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,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6355324edbc72840fd27d9f27cada7f597637544bcf98d120d21fd78f245eb04,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,4c83ef96036b8dd1917ec6fc6f1f95166ce77ddf4bf2c6f94a986c40079ef11d,Tests_failed,b0f9220866a8544b5070f7577df2b25ce5c9d757230d9f2a1a55298e92f3f095,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,0.03746318817138672,0.04988908767700195,0.03250265121459961,0.01686716079711914,0.046083688735961914,0.04366564750671387,0.030047178268432617,0.17029142379760742,0.0755617618560791,0.8004753589630127,0.34023451805114746,0.08558225631713867,0.05827951431274414,0.08062028884887695,0.05831623077392578,0.11156201362609863 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,True,True,Tests_passed,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,True,2,10,48,2,True,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,True,2,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,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,6355324edbc72840fd27d9f27cada7f597637544bcf98d120d21fd78f245eb04,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,4c83ef96036b8dd1917ec6fc6f1f95166ce77ddf4bf2c6f94a986c40079ef11d,Tests_failed,b0f9220866a8544b5070f7577df2b25ce5c9d757230d9f2a1a55298e92f3f095,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,e489adf4a89d995c290087740fa739329b8624180741e73863a1dcda93801bd5,Tests_passed,a2302cd67511ad731cf562f0082e752059c4275702276f469657ccf7fe7d09fb,0.03746318817138672,0.04988908767700195,0.03250265121459961,0.01686716079711914,0.046083688735961914,0.04366564750671387,0.030047178268432617,0.17029142379760742,0.0755617618560791,0.8004753589630127,0.34023451805114746,0.08558225631713867,0.05827951431274414,0.08062028884887695,0.05831623077392578,0.11156201362609863,0.055623769760131836,0.10499691963195801,0.057945966720581055,0.11417984962463379,0.09492063522338867,0.05626702308654785,0.11052680015563965,0.08834481239318848,0.1456146240234375,0.8763294219970703,0.328310489654541,0.05707716941833496,0.10306024551391602,0.0555422306060791,0.10365629196166992,0.0565643310546875 diff --git a/results/combined/merges_timed/turbospaces/turbospaces.csv b/results/combined/merges_timed/turbospaces/turbospaces.csv index d6a1053734..0c8860d112 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,True,True,Tests_passed,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,True,22,117,1267,2,True,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,True,22,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,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,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,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,2e1f50cff4f14e2f917d0c8250c4f180ca7a38def8b6ae9b958f5e5b04601824,Tests_failed,5e6a9e5c5f6078d70209ed195dad0a44ad2830ac31f2c5d3b06bbfa02df5be49,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,0.015007257461547852,0.01499795913696289,0.017852067947387695,0.024892091751098633,0.01806926727294922,0.01778435707092285,0.017854928970336914,0.044738054275512695,0.07070255279541016,0.7909126281738281,1.227013349533081,0.04609346389770508,0.07458901405334473,0.04727625846862793,0.06969285011291504,0.07374978065490723 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,True,True,Tests_passed,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,True,22,117,1267,2,True,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,True,22,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,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,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,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,2e1f50cff4f14e2f917d0c8250c4f180ca7a38def8b6ae9b958f5e5b04601824,Tests_failed,5e6a9e5c5f6078d70209ed195dad0a44ad2830ac31f2c5d3b06bbfa02df5be49,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,0.015007257461547852,0.01499795913696289,0.017852067947387695,0.024892091751098633,0.01806926727294922,0.01778435707092285,0.017854928970336914,0.044738054275512695,0.07070255279541016,0.7909126281738281,1.227013349533081,0.04609346389770508,0.07458901405334473,0.04727625846862793,0.06969285011291504,0.07374978065490723,0.07131290435791016,0.06911373138427734,0.0719146728515625,0.06986379623413086,0.07442164421081543,0.07320308685302734,0.07148432731628418,0.10854482650756836,0.09538817405700684,0.8794810771942139,1.2727775573730469,0.07142782211303711,0.06865334510803223,0.06009960174560547,0.06946110725402832,0.07011246681213379 diff --git a/results/combined/merges_timed/turini/vraptor-authz.csv b/results/combined/merges_timed/turini/vraptor-authz.csv index 5426d663f7..e69e4992fb 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,True,True,Tests_passed,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,True,5,10,59,2,True,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,True,5,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,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,Merge_failed,3985fae186bc0502b904bc0f964b36072051a6c3fed811f6b2b0b72857fc2c9d,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,946a106b6ad563b4a972be377278568818bfe857d78d118b0b64e7b4e72cd499,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,186d8dca675a30b477ce03eac7430106b6abfef524a705476f2fba3e1236532d,Tests_failed,09ac123119e2ad5e42b348afa24895a5c208013a70c0dc5ff0885cc0692aca12,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,0.03749251365661621,0.03683066368103027,0.034343719482421875,0.012022018432617188,0.035796165466308594,0.03577136993408203,0.027764081954956055,0.16187000274658203,0.11249327659606934,0.5201516151428223,0.24050331115722656,0.03841543197631836,0.03973078727722168,0.03746914863586426,0.04008793830871582,0.04944252967834473 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,True,True,Tests_passed,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,True,5,10,59,2,True,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,True,5,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,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,Merge_failed,3985fae186bc0502b904bc0f964b36072051a6c3fed811f6b2b0b72857fc2c9d,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,946a106b6ad563b4a972be377278568818bfe857d78d118b0b64e7b4e72cd499,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,186d8dca675a30b477ce03eac7430106b6abfef524a705476f2fba3e1236532d,Tests_failed,09ac123119e2ad5e42b348afa24895a5c208013a70c0dc5ff0885cc0692aca12,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Tests_passed,22fb2d44cfde64d5270d5e24095dc85f74b0ea15d63a676f4132b2bbd555b7f2,0.03749251365661621,0.03683066368103027,0.034343719482421875,0.012022018432617188,0.035796165466308594,0.03577136993408203,0.027764081954956055,0.16187000274658203,0.11249327659606934,0.5201516151428223,0.24050331115722656,0.03841543197631836,0.03973078727722168,0.03746914863586426,0.04008793830871582,0.04944252967834473,0.040590763092041016,0.04914402961730957,0.03989577293395996,0.03935575485229492,0.0393369197845459,0.039923906326293945,0.03924918174743652,0.07155084609985352,0.07948827743530273,0.6076743602752686,0.3140392303466797,0.0411224365234375,0.0402677059173584,0.04037761688232422,0.040299415588378906,0.04910755157470703 diff --git a/results/combined/merges_timed/twilio/starter-java.csv b/results/combined/merges_timed/twilio/starter-java.csv index 91be7518d5..b2e6b95b07 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,True,True,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,True,3,2,4,2,True,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,True,3,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,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,55824f3df162ab82095ef990fa63f6fb4d1a7cc4a75d04f04ca08f431c91840d,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,9b3c3eba2b222db25c558c31179c0946ab9eb4f2cc8c1ec45fbd4c004ac65586,Tests_failed,88904aef5a6af83bc43ecb7215013eb5c44bda1f09101049e3d2bce4dad4a3ab,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,0.03761744499206543,0.0364992618560791,0.03437495231628418,0.011978387832641602,0.03448152542114258,0.0345911979675293,0.037702322006225586,0.15799951553344727,0.11231684684753418,0.43064379692077637,0.22272419929504395,0.038564443588256836,0.03982281684875488,0.039299964904785156,0.0393373966217041,0.03909182548522949 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,True,True,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,True,3,2,4,2,True,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,True,3,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,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,55824f3df162ab82095ef990fa63f6fb4d1a7cc4a75d04f04ca08f431c91840d,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,9b3c3eba2b222db25c558c31179c0946ab9eb4f2cc8c1ec45fbd4c004ac65586,Tests_failed,88904aef5a6af83bc43ecb7215013eb5c44bda1f09101049e3d2bce4dad4a3ab,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,0.03761744499206543,0.0364992618560791,0.03437495231628418,0.011978387832641602,0.03448152542114258,0.0345911979675293,0.037702322006225586,0.15799951553344727,0.11231684684753418,0.43064379692077637,0.22272419929504395,0.038564443588256836,0.03982281684875488,0.039299964904785156,0.0393373966217041,0.03909182548522949,0.03796720504760742,0.03756093978881836,0.0366668701171875,0.03862309455871582,0.03815484046936035,0.03747987747192383,0.03821086883544922,0.06919336318969727,0.0831599235534668,0.458096981048584,0.282916784286499,0.03860068321228027,0.03809928894042969,0.03732895851135254,0.0368504524230957,0.037888288497924805 diff --git a/results/combined/merges_timed/twilio/twilio-java.csv b/results/combined/merges_timed/twilio/twilio-java.csv index 2b130ae802..b9bf117b61 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,True,27,70,554,2,True,27,Tests_passed,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,True,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,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,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,7ccafa57d3cc777a02aec33fa6e23b982cff685e240bfc95ac0d7499f5fb8f62,Tests_passed,4cf4ee0466722fcb76af04038c115b7803ed30df8d6b86877ffa1d185d8eee66,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,0.010402202606201172,0.010457038879394531,0.011280536651611328,0.01870107650756836,0.01136016845703125,0.011229991912841797,0.011070728302001953,0.03582119941711426,0.06473612785339355,0.518751859664917,0.612617015838623,0.035302162170410156,0.06170344352722168,0.03435516357421875,0.06142258644104004,0.0605623722076416 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,True,27,70,554,2,True,27,Tests_passed,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,True,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,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,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,7ccafa57d3cc777a02aec33fa6e23b982cff685e240bfc95ac0d7499f5fb8f62,Tests_passed,4cf4ee0466722fcb76af04038c115b7803ed30df8d6b86877ffa1d185d8eee66,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,Tests_passed,67c8e7c811ef643ec5b1ff19c37cf9ba7af9b030c3d95358d96228ffe153a634,0.010402202606201172,0.010457038879394531,0.011280536651611328,0.01870107650756836,0.01136016845703125,0.011229991912841797,0.011070728302001953,0.03582119941711426,0.06473612785339355,0.518751859664917,0.612617015838623,0.035302162170410156,0.06170344352722168,0.03435516357421875,0.06142258644104004,0.0605623722076416,0.05830216407775879,0.05718731880187988,0.05898332595825195,0.05867409706115723,0.05924582481384277,0.059689998626708984,0.059736013412475586,0.0923311710357666,0.08915233612060547,0.5983190536499023,0.636338472366333,0.058122873306274414,0.05820894241333008,0.057383060455322266,0.05831122398376465,0.057589054107666016 diff --git a/results/combined/merges_timed/tyagihas/java_nats.csv b/results/combined/merges_timed/tyagihas/java_nats.csv index d45bda2f6c..b6a9134fa2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,False,True,2,4,8,2,True,2,Tests_passed,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,True,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,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,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,3dbbca2bae3c65fa792be3e1803989225c61adb67b14fdf82a42d691a7568272,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,0.04514312744140625,0.04834270477294922,0.0399322509765625,0.021370887756347656,0.03916525840759277,0.04670238494873047,0.04463648796081543,0.16697168350219727,0.11380171775817871,1.5317983627319336,0.40795063972473145,0.03993415832519531,0.06645941734313965,0.03941512107849121,0.06858658790588379,0.06745624542236328 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,False,True,2,4,8,2,True,2,Tests_passed,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,True,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,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,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,3dbbca2bae3c65fa792be3e1803989225c61adb67b14fdf82a42d691a7568272,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,a070ac3aeb707f656241c7f2f854340b7f0dd49870a2894b2f35be2d613531fb,Tests_passed,2f640d79d38bc01b5b3cebd327d105ed8ce4376d0a610b60a5d3ffee4df45676,0.04514312744140625,0.04834270477294922,0.0399322509765625,0.021370887756347656,0.03916525840759277,0.04670238494873047,0.04463648796081543,0.16697168350219727,0.11380171775817871,1.5317983627319336,0.40795063972473145,0.03993415832519531,0.06645941734313965,0.03941512107849121,0.06858658790588379,0.06745624542236328,0.06702470779418945,0.06748342514038086,0.06899619102478027,0.06773138046264648,0.06721711158752441,0.0664377212524414,0.06825041770935059,0.10163307189941406,0.10033750534057617,1.475665807723999,0.4387075901031494,0.06565427780151367,0.06556272506713867,0.06724882125854492,0.06724929809570312,0.06662273406982422 diff --git a/results/combined/merges_timed/tynamo/tapestry-security.csv b/results/combined/merges_timed/tynamo/tapestry-security.csv index a6c8ff9411..b9ef94dbe2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,True,11,21,136,2,True,11,Tests_passed,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,True,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,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,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,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,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,280b23697876fbfa0c3cf39aa9a2ff465b5d19d118a20457ff7b583a67e5cd62,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,0.011854410171508789,0.011873245239257812,0.013995647430419922,0.020788908004760742,0.013672590255737305,0.013475894927978516,0.013625860214233398,0.03948712348937988,0.0679171085357666,1.1693241596221924,0.4260580539703369,0.04125261306762695,0.06464385986328125,0.04259848594665527,0.06094813346862793,0.06796574592590332 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,True,11,21,136,2,True,11,Tests_passed,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,True,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,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,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,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,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,280b23697876fbfa0c3cf39aa9a2ff465b5d19d118a20457ff7b583a67e5cd62,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,0.011854410171508789,0.011873245239257812,0.013995647430419922,0.020788908004760742,0.013672590255737305,0.013475894927978516,0.013625860214233398,0.03948712348937988,0.0679171085357666,1.1693241596221924,0.4260580539703369,0.04125261306762695,0.06464385986328125,0.04259848594665527,0.06094813346862793,0.06796574592590332,0.06650996208190918,0.06735539436340332,0.06915020942687988,0.06799721717834473,0.06933188438415527,0.06786012649536133,0.0667257308959961,0.10568618774414062,0.09946107864379883,1.5352749824523926,0.4678778648376465,0.06969213485717773,0.06801342964172363,0.06641483306884766,0.06709933280944824,0.06508946418762207 diff --git a/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv b/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv index dcb1dcec25..840edb4eef 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,True,True,Tests_passed,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,True,4,35,243,3,True,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,True,4,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,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,f44949eebdbafe950adac1cf20d9aa64345b9831e6f20dbb0b7bac67537b636f,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,5afcda93a8782c316cb45f77e015cf7239f0f6026691d799f32a901541639881,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,9b9667aa7e043df2b15c44655b0f839f70192a168864271f7c38a1c6156557f2,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,0.04102826118469238,0.04026341438293457,0.03988504409790039,0.013047933578491211,0.04004693031311035,0.03931927680969238,0.0372006893157959,0.22145986557006836,0.17002439498901367,1.059084415435791,0.5303597450256348,0.039897918701171875,0.0577855110168457,0.040972232818603516,0.06170177459716797,0.06142091751098633 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,True,True,Tests_passed,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,True,4,35,243,3,True,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,True,4,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,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,f44949eebdbafe950adac1cf20d9aa64345b9831e6f20dbb0b7bac67537b636f,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,5afcda93a8782c316cb45f77e015cf7239f0f6026691d799f32a901541639881,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,9b9667aa7e043df2b15c44655b0f839f70192a168864271f7c38a1c6156557f2,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,0.04102826118469238,0.04026341438293457,0.03988504409790039,0.013047933578491211,0.04004693031311035,0.03931927680969238,0.0372006893157959,0.22145986557006836,0.17002439498901367,1.059084415435791,0.5303597450256348,0.039897918701171875,0.0577855110168457,0.040972232818603516,0.06170177459716797,0.06142091751098633,0.06598353385925293,0.06579995155334473,0.06475830078125,0.06959986686706543,0.07336068153381348,0.06573796272277832,0.06970071792602539,0.11875486373901367,0.14130091667175293,1.3065273761749268,0.6653270721435547,0.06484580039978027,0.0664525032043457,0.06569051742553711,0.06472897529602051,0.06541776657104492 diff --git a/results/combined/merges_timed/uklimaschewski/evalex.csv b/results/combined/merges_timed/uklimaschewski/evalex.csv index d3181da8c4..5fe3e63118 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,Tests_passed,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,True,3,21,212,2,True,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,True,3,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_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,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_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,25dc40f72c38ee317e23c0ec2077318946c764939bdb747cc85981d08131a5ab,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,0.04999065399169922,0.04826998710632324,0.04838919639587402,0.017705917358398438,0.04271340370178223,0.049001455307006836,0.03878426551818848,0.1768479347229004,0.11624455451965332,2.362563371658325,0.5251431465148926,0.033209800720214844,0.060862064361572266,0.03343963623046875,0.06386804580688477,0.06653833389282227 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,Tests_passed,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,True,3,21,212,2,True,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,True,3,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_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,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_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,25dc40f72c38ee317e23c0ec2077318946c764939bdb747cc85981d08131a5ab,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,0.04999065399169922,0.04826998710632324,0.04838919639587402,0.017705917358398438,0.04271340370178223,0.049001455307006836,0.03878426551818848,0.1768479347229004,0.11624455451965332,2.362563371658325,0.5251431465148926,0.033209800720214844,0.060862064361572266,0.03343963623046875,0.06386804580688477,0.06653833389282227,0.06149649620056152,0.06219172477722168,0.06159329414367676,0.061545372009277344,0.06326603889465332,0.06532812118530273,0.06167101860046387,0.09683060646057129,0.09319829940795898,2.332164764404297,0.5424566268920898,0.06266999244689941,0.06257987022399902,0.06079387664794922,0.06271219253540039,0.06275725364685059 diff --git a/results/combined/merges_timed/umut/spring-social-salesforce.csv b/results/combined/merges_timed/umut/spring-social-salesforce.csv index 3d0c16f0ad..197b7dff78 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,True,20,36,1168,2,True,20,Tests_passed,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,True,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,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,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,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,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,81d334a42ea6b0e3e77138cd46ea91672753aeb05cffd66c19e4b2749f0098da,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,0.04053139686584473,0.045568227767944336,0.050142765045166016,0.020838260650634766,0.0413050651550293,0.03874015808105469,0.03651309013366699,0.18294525146484375,0.11135029792785645,0.6087915897369385,0.33073854446411133,0.04024100303649902,0.06453156471252441,0.04074263572692871,0.06375265121459961,0.06499576568603516 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,True,20,36,1168,2,True,20,Tests_passed,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,True,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,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,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,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,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,81d334a42ea6b0e3e77138cd46ea91672753aeb05cffd66c19e4b2749f0098da,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,0.04053139686584473,0.045568227767944336,0.050142765045166016,0.020838260650634766,0.0413050651550293,0.03874015808105469,0.03651309013366699,0.18294525146484375,0.11135029792785645,0.6087915897369385,0.33073854446411133,0.04024100303649902,0.06453156471252441,0.04074263572692871,0.06375265121459961,0.06499576568603516,0.06168007850646973,0.06329894065856934,0.06423830986022949,0.06359672546386719,0.06645727157592773,0.06227827072143555,0.06562495231628418,0.0965268611907959,0.09262919425964355,0.6271002292633057,0.36281251907348633,0.06433725357055664,0.06308293342590332,0.06463503837585449,0.06181907653808594,0.06269598007202148 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-api.csv b/results/combined/merges_timed/unitsofmeasurement/unit-api.csv index 837b2b4872..47ebc6f29b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,True,101,121,15500,3,True,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,True,101,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,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Tests_failed,157a2be2185b3c87d408afed6446e9a9f3a84af0326831c0d280a7e5dbeb6684,Merge_failed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Merge_failed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Tests_failed,dd72b24f954c52a4fe76cf97395581647505603d25ad266646b790d24f6b76b5,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,0.04342174530029297,0.06737899780273438,0.03961753845214844,0.02949666976928711,0.046526193618774414,0.061394691467285156,0.05493927001953125,0.2726869583129883,0.18018674850463867,0.052156925201416016,0.716681957244873,0.06737136840820312,0.09099292755126953,0.06942629814147949,0.09735417366027832,0.10469698905944824 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,True,101,121,15500,3,True,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,True,101,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,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Tests_failed,157a2be2185b3c87d408afed6446e9a9f3a84af0326831c0d280a7e5dbeb6684,Merge_failed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Merge_failed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Tests_failed,dd72b24f954c52a4fe76cf97395581647505603d25ad266646b790d24f6b76b5,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,Tests_passed,5e6e4e6abb02fb23a5a76fa5f472ce09e40fcf4687309c05583b49faab577bdb,0.04342174530029297,0.06737899780273438,0.03961753845214844,0.02949666976928711,0.046526193618774414,0.061394691467285156,0.05493927001953125,0.2726869583129883,0.18018674850463867,0.052156925201416016,0.716681957244873,0.06737136840820312,0.09099292755126953,0.06942629814147949,0.09735417366027832,0.10469698905944824,0.09728050231933594,0.10117554664611816,0.0964043140411377,0.06275486946105957,0.09624409675598145,0.08890271186828613,0.09934520721435547,0.13764691352844238,0.16309165954589844,1.0689916610717773,0.8639633655548096,0.09235692024230957,0.09172940254211426,0.09686565399169922,0.09215092658996582,0.10154175758361816 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv b/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv index 5bc15f99ca..5b7ded675f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,16,53,270,3,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,16,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,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_failed,f884412a856f40d11b11da2ebee3370bd0e6c6619cea5d0f1eefb00bc520ee23,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,0.04952669143676758,0.05021309852600098,0.0483546257019043,0.056143999099731445,0.06855463981628418,0.029349088668823242,0.01993417739868164,0.2368924617767334,0.16765117645263672,0.053243398666381836,0.5445990562438965,0.09345722198486328,0.12315130233764648,0.09785270690917969,0.15301799774169922,0.15241289138793945 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,16,53,270,3,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,16,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,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_failed,f884412a856f40d11b11da2ebee3370bd0e6c6619cea5d0f1eefb00bc520ee23,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,0.04952669143676758,0.05021309852600098,0.0483546257019043,0.056143999099731445,0.06855463981628418,0.029349088668823242,0.01993417739868164,0.2368924617767334,0.16765117645263672,0.053243398666381836,0.5445990562438965,0.09345722198486328,0.12315130233764648,0.09785270690917969,0.15301799774169922,0.15241289138793945,0.1513652801513672,0.15702342987060547,0.16620182991027832,0.16026926040649414,0.16375136375427246,0.1000220775604248,0.133317232131958,0.23923349380493164,0.20450210571289062,0.15061187744140625,0.6358926296234131,0.15822601318359375,0.09783244132995605,0.13711762428283691,0.15481209754943848,0.15023565292358398 diff --git a/results/combined/merges_timed/unitsofmeasurement/uom-se.csv b/results/combined/merges_timed/unitsofmeasurement/uom-se.csv index 08f08dbefa..9231838d58 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,True,16,53,270,3,True,16,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,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,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_failed,f884412a856f40d11b11da2ebee3370bd0e6c6619cea5d0f1eefb00bc520ee23,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,0.040654897689819336,0.04229855537414551,0.035779714584350586,0.02217245101928711,0.03989887237548828,0.03497886657714844,0.05681133270263672,0.24170851707458496,0.15783262252807617,0.05457353591918945,0.5536737442016602,0.09568524360656738,0.15496516227722168,0.09287691116333008,0.12468504905700684,0.12729239463806152 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,True,16,53,270,3,True,16,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,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,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_failed,f884412a856f40d11b11da2ebee3370bd0e6c6619cea5d0f1eefb00bc520ee23,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,Tests_passed,6c57bf9d835f43c20ddf5fe6a4dec954c228073f00823fc26afff42c54847fb8,0.040654897689819336,0.04229855537414551,0.035779714584350586,0.02217245101928711,0.03989887237548828,0.03497886657714844,0.05681133270263672,0.24170851707458496,0.15783262252807617,0.05457353591918945,0.5536737442016602,0.09568524360656738,0.15496516227722168,0.09287691116333008,0.12468504905700684,0.12729239463806152,0.1578373908996582,0.15479683876037598,0.15946197509765625,0.16146254539489746,0.1638040542602539,0.162977933883667,0.10273408889770508,0.20041561126708984,0.22838711738586426,0.1552267074584961,0.6351234912872314,0.13109922409057617,0.15684175491333008,0.0987544059753418,0.15117144584655762,0.14940452575683594 diff --git a/results/combined/merges_timed/univocity/univocity-parsers.csv b/results/combined/merges_timed/univocity/univocity-parsers.csv index 45e737238c..08b6faa6b5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,True,True,True,4,7,207,15,True,17,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,True,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,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,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,3e1a50517e98fb318e93c4ab1431150b875da30e88c94b1a154cc2c88d92384d,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,0.032270193099975586,0.0350189208984375,0.022449493408203125,0.03467726707458496,0.019934415817260742,0.015309572219848633,0.01880955696105957,0.11253190040588379,0.09871745109558105,1.8368995189666748,0.6329305171966553,0.0350337028503418,0.07113146781921387,0.061469078063964844,0.10338616371154785,0.10075902938842773 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,True,True,True,4,7,207,15,True,17,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,True,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,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,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,3e1a50517e98fb318e93c4ab1431150b875da30e88c94b1a154cc2c88d92384d,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,Tests_passed,db7264f76d39568d7ba0deef4b34d8a327c127cd1ff9745e325721692b226dec,0.032270193099975586,0.0350189208984375,0.022449493408203125,0.03467726707458496,0.019934415817260742,0.015309572219848633,0.01880955696105957,0.11253190040588379,0.09871745109558105,1.8368995189666748,0.6329305171966553,0.0350337028503418,0.07113146781921387,0.061469078063964844,0.10338616371154785,0.10075902938842773,0.09483051300048828,0.0970306396484375,0.10464239120483398,0.06940627098083496,0.06862831115722656,0.09897756576538086,0.1038980484008789,0.14164400100708008,0.136613130569458,1.700105905532837,0.712416410446167,0.08921170234680176,0.09871697425842285,0.0956888198852539,0.06951642036437988,0.06882929801940918 diff --git a/results/combined/merges_timed/unruly/junit-rules.csv b/results/combined/merges_timed/unruly/junit-rules.csv index a7524a9f05..825d98b042 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,True,True,Tests_passed,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,True,5,12,114,4,True,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,True,5,True,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,11e610e9b8b910b9bedb0e57f82f16af16ea698be5043be4159e208d96197f19,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,ae6bfa5706e56bd489ee58c179cd2f2eed50691a89e1d590126a70bc33945473,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,960e65f5a46c493a22d459eba24a539eab3fb07d404cecb33fdf54e5de6379e7,Tests_failed,85df0e64638b9e5b2f021e3786131142e024d1db73728d3be9fd7d0b458219fd,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,0.03817868232727051,0.03901481628417969,0.03864479064941406,0.013168096542358398,0.03712654113769531,0.038132667541503906,0.03747248649597168,0.2868845462799072,0.22166776657104492,1.1187233924865723,0.25284600257873535,0.038449764251708984,0.07512140274047852,0.037661075592041016,0.07531595230102539,0.0769343376159668 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,True,True,Tests_passed,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,True,5,12,114,4,True,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,True,5,True,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,11e610e9b8b910b9bedb0e57f82f16af16ea698be5043be4159e208d96197f19,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,ae6bfa5706e56bd489ee58c179cd2f2eed50691a89e1d590126a70bc33945473,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,960e65f5a46c493a22d459eba24a539eab3fb07d404cecb33fdf54e5de6379e7,Tests_failed,85df0e64638b9e5b2f021e3786131142e024d1db73728d3be9fd7d0b458219fd,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,0.03817868232727051,0.03901481628417969,0.03864479064941406,0.013168096542358398,0.03712654113769531,0.038132667541503906,0.03747248649597168,0.2868845462799072,0.22166776657104492,1.1187233924865723,0.25284600257873535,0.038449764251708984,0.07512140274047852,0.037661075592041016,0.07531595230102539,0.0769343376159668,0.07789301872253418,0.07657957077026367,0.07588982582092285,0.07568931579589844,0.07635068893432617,0.0737297534942627,0.0754237174987793,0.13823938369750977,0.16135454177856445,1.2436764240264893,0.3644585609436035,0.07825541496276855,0.07598495483398438,0.07512164115905762,0.0743412971496582,0.07826519012451172 diff --git a/results/combined/merges_timed/urbanairship/datacube.csv b/results/combined/merges_timed/urbanairship/datacube.csv index 8a968a2c3a..99d5cf6382 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,Tests_passed,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,True,5,12,75,2,True,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,True,5,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,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,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,7afe84d4b93ca52f330c93c2cb0fc55f9df702855bf053ad465bcaa52e312d97,Tests_failed,c3e6f17ef3e4439256f75d07950bd15b550221bbc23d28e8c300d87c4c634a0b,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,0.11950564384460449,0.12035369873046875,0.010845184326171875,0.18758249282836914,0.010720968246459961,0.17339849472045898,0.011289119720458984,0.2553989887237549,0.17539095878601074,1.0702314376831055,0.5156795978546143,0.267669677734375,0.31044435501098633,0.2714557647705078,0.30971693992614746,0.2786226272583008 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,Tests_passed,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,True,5,12,75,2,True,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,True,5,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,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,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,7afe84d4b93ca52f330c93c2cb0fc55f9df702855bf053ad465bcaa52e312d97,Tests_failed,c3e6f17ef3e4439256f75d07950bd15b550221bbc23d28e8c300d87c4c634a0b,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,0.11950564384460449,0.12035369873046875,0.010845184326171875,0.18758249282836914,0.010720968246459961,0.17339849472045898,0.011289119720458984,0.2553989887237549,0.17539095878601074,1.0702314376831055,0.5156795978546143,0.267669677734375,0.31044435501098633,0.2714557647705078,0.30971693992614746,0.2786226272583008,0.2892029285430908,0.2080855369567871,0.35100507736206055,0.35779571533203125,0.31577420234680176,0.34662818908691406,0.34326696395874023,0.23766827583312988,0.3880624771118164,1.2666640281677246,0.5098419189453125,0.28798866271972656,0.2702066898345947,0.2178339958190918,0.2906455993652344,0.30263423919677734 diff --git a/results/combined/merges_timed/urbanairship/java-library.csv b/results/combined/merges_timed/urbanairship/java-library.csv index d7225c9520..5830c73d8e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,Tests_passed,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,True,5,14,30,2,True,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,True,5,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,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,2952e4ec284c44c94a0a705ddeac870ea9cd15f0b754f45e8ff3fad35bf7826f,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Tests_failed,f24b69797e56be2d1e701187623791b3469a5b231f0b1e5f41800660d5a9c16d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,0.05812692642211914,0.046090126037597656,0.04871654510498047,0.02156829833984375,0.056825876235961914,0.050248146057128906,0.056765079498291016,0.21186137199401855,0.14960193634033203,3.098188638687134,0.7676205635070801,0.05290794372558594,0.051629066467285156,0.052915334701538086,0.053600311279296875,0.05366826057434082 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,Tests_passed,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,True,5,14,30,2,True,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,True,5,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,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,2952e4ec284c44c94a0a705ddeac870ea9cd15f0b754f45e8ff3fad35bf7826f,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Tests_failed,f24b69797e56be2d1e701187623791b3469a5b231f0b1e5f41800660d5a9c16d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,0.05812692642211914,0.046090126037597656,0.04871654510498047,0.02156829833984375,0.056825876235961914,0.050248146057128906,0.056765079498291016,0.21186137199401855,0.14960193634033203,3.098188638687134,0.7676205635070801,0.05290794372558594,0.051629066467285156,0.052915334701538086,0.053600311279296875,0.05366826057434082,0.05026435852050781,0.05063033103942871,0.05261683464050293,0.05134892463684082,0.05027341842651367,0.05249333381652832,0.05127596855163574,0.08841466903686523,0.09262394905090332,3.0218758583068848,0.7490687370300293,0.05109000205993652,0.05122709274291992,0.05010724067687988,0.05041003227233887,0.050631046295166016 diff --git a/results/combined/merges_timed/urbancode/terraform.csv b/results/combined/merges_timed/urbancode/terraform.csv index b15bed919b..aaa4a7d460 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,True,8,32,345,2,True,8,Tests_passed,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,True,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,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,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,29014519e060f6b70af72dd76c383766b2b0fd494ef0f17de516bea4f030421f,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Tests_failed,760f22e02f561a7e2ea29b4397967fc9a19231228da7d225fd8548f148c6f615,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,0.013887405395507812,0.013849020004272461,0.015292644500732422,0.024340391159057617,0.01487421989440918,0.01495051383972168,0.014254093170166016,0.04125404357910156,0.07480216026306152,0.6047706604003906,0.4296293258666992,0.0509798526763916,0.05331301689147949,0.05268430709838867,0.051566123962402344,0.05349278450012207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,True,8,32,345,2,True,8,Tests_passed,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,True,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,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,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,29014519e060f6b70af72dd76c383766b2b0fd494ef0f17de516bea4f030421f,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Tests_failed,760f22e02f561a7e2ea29b4397967fc9a19231228da7d225fd8548f148c6f615,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,0.013887405395507812,0.013849020004272461,0.015292644500732422,0.024340391159057617,0.01487421989440918,0.01495051383972168,0.014254093170166016,0.04125404357910156,0.07480216026306152,0.6047706604003906,0.4296293258666992,0.0509798526763916,0.05331301689147949,0.05268430709838867,0.051566123962402344,0.05349278450012207,0.050461530685424805,0.04889678955078125,0.042028188705444336,0.05181097984313965,0.05064249038696289,0.05243515968322754,0.050742387771606445,0.07348799705505371,0.09148859977722168,0.6889665126800537,0.4865586757659912,0.04339170455932617,0.05162668228149414,0.050695180892944336,0.04986000061035156,0.050429344177246094 diff --git a/results/combined/merges_timed/urish/gwt-titanium.csv b/results/combined/merges_timed/urish/gwt-titanium.csv index 0f8c32830f..7dc32d4246 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,True,True,True,153,257,34067,35,True,153,Tests_passed,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,True,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,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,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Tests_failed,35129bb7c9a10431e89331c05256d9aa956b876f0a6758bb38e679ce85d78712,Merge_failed,d1289a3963f07524cf9af04426a5b80f3a08e7a4401b1902db3aa52051950962,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,4d348399107d4c96fead5c0cec3ae5df4baf0ace227cf57e0faf8b41946855fd,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,e3ffce6fdf0f54a0ab73020288fadac4206dec41cfd263209a22a29775c6cec0,Merge_failed,d8b68bd427d9e9672fee12c33405b00178217259666986098c9f9990fa6943da,Tests_failed,17258797efab603c9e5beae70167505e9d229ffca3c7ab8bd363e4af62e04c1e,Tests_failed,272b1f148f2ed8e35846e7b93add4016d839acb53203d36e0ed6ed917c30d91c,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,0.041434526443481445,0.030248641967773438,0.05463361740112305,0.03760337829589844,0.04567098617553711,0.03812694549560547,0.049129486083984375,1.3313608169555664,2.0178568363189697,15.254916429519653,1.6583387851715088,0.4363679885864258,0.7264575958251953,0.4328303337097168,0.7239007949829102,0.7482178211212158 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,True,True,True,153,257,34067,35,True,153,Tests_passed,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,True,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,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,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Tests_failed,35129bb7c9a10431e89331c05256d9aa956b876f0a6758bb38e679ce85d78712,Merge_failed,d1289a3963f07524cf9af04426a5b80f3a08e7a4401b1902db3aa52051950962,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,4d348399107d4c96fead5c0cec3ae5df4baf0ace227cf57e0faf8b41946855fd,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,e3ffce6fdf0f54a0ab73020288fadac4206dec41cfd263209a22a29775c6cec0,Merge_failed,d8b68bd427d9e9672fee12c33405b00178217259666986098c9f9990fa6943da,Tests_failed,17258797efab603c9e5beae70167505e9d229ffca3c7ab8bd363e4af62e04c1e,Tests_failed,272b1f148f2ed8e35846e7b93add4016d839acb53203d36e0ed6ed917c30d91c,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Merge_failed,253e0a48e383d4b5c99fbe0365deec1f9cf59254728f31974bbe98ceeea10be1,Tests_passed,b29c5610c033be2ed0e414fe2c11d59cfc10376d0d246bf266e8e87172f90547,0.041434526443481445,0.030248641967773438,0.05463361740112305,0.03760337829589844,0.04567098617553711,0.03812694549560547,0.049129486083984375,1.3313608169555664,2.0178568363189697,15.254916429519653,1.6583387851715088,0.4363679885864258,0.7264575958251953,0.4328303337097168,0.7239007949829102,0.7482178211212158,0.6905937194824219,0.6902594566345215,0.6858055591583252,0.7025763988494873,0.6811013221740723,0.6843550205230713,0.697376012802124,1.2098679542541504,1.528733730316162,15.237380504608154,2.371699333190918,0.686046838760376,0.6914775371551514,0.6847021579742432,0.6833770275115967,0.6787707805633545 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 52df4c1ee7..f60454f77f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,True,True,True,178,639,3533,4,True,178,Tests_passed,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,True,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,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,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,7134ce294b091b0b74e432e09bd1dd26988f6502047ff92b68c077c45c574480,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,0.0634758472442627,0.05135655403137207,0.057817935943603516,0.031584739685058594,0.06470417976379395,0.06846928596496582,0.06708574295043945,0.32297730445861816,0.25173425674438477,1.2036387920379639,1.1340336799621582,0.06967568397521973,0.09678912162780762,0.08692693710327148,0.12983489036560059,0.13010835647583008 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,True,True,True,178,639,3533,4,True,178,Tests_passed,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,True,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,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,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,7134ce294b091b0b74e432e09bd1dd26988f6502047ff92b68c077c45c574480,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,Tests_passed,36c49e818778c222222fbc93b848088317a167acb3855e050a31a1f1dd6d2583,0.0634758472442627,0.05135655403137207,0.057817935943603516,0.031584739685058594,0.06470417976379395,0.06846928596496582,0.06708574295043945,0.32297730445861816,0.25173425674438477,1.2036387920379639,1.1340336799621582,0.06967568397521973,0.09678912162780762,0.08692693710327148,0.12983489036560059,0.13010835647583008,0.12483334541320801,0.12222552299499512,0.13243651390075684,0.13352489471435547,0.13477206230163574,0.12965679168701172,0.12058687210083008,0.19025540351867676,0.22615361213684082,1.3700313568115234,1.3084490299224854,0.12846612930297852,0.13045692443847656,0.12905645370483398,0.12115287780761719,0.12150216102600098 diff --git a/results/combined/merges_timed/valotrading/silvertip.csv b/results/combined/merges_timed/valotrading/silvertip.csv index 4faa1cf1fb..b97a320613 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,True,24,33,445,5,True,24,Tests_passed,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,True,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,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,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_failed,19c9ce8102e4b0475e451525038cc3d4c0602f72f1d23cdd7d685a3fc1df1af8,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,0.012937068939208984,0.04482126235961914,0.042548179626464844,0.015931367874145508,0.0429685115814209,0.04750633239746094,0.034178972244262695,0.3603978157043457,0.27751755714416504,2.645644187927246,0.3974134922027588,0.03078436851501465,0.1105649471282959,0.03133225440979004,0.10932374000549316,0.11057019233703613 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,True,24,33,445,5,True,24,Tests_passed,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,True,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,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,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_failed,19c9ce8102e4b0475e451525038cc3d4c0602f72f1d23cdd7d685a3fc1df1af8,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,645b4d48b49e83f2125a50c2cbbad0db46b10a26f4d3b245a1626030408ec1dc,Tests_passed,fc4b079595edbab3ca10f6d51e6a2813c199eb2c0515375d8bc0165737892a6d,0.012937068939208984,0.04482126235961914,0.042548179626464844,0.015931367874145508,0.0429685115814209,0.04750633239746094,0.034178972244262695,0.3603978157043457,0.27751755714416504,2.645644187927246,0.3974134922027588,0.03078436851501465,0.1105649471282959,0.03133225440979004,0.10932374000549316,0.11057019233703613,0.10289359092712402,0.10315227508544922,0.10391879081726074,0.10460829734802246,0.10596895217895508,0.10554027557373047,0.1024320125579834,0.18165922164916992,0.20098519325256348,2.672220230102539,0.4420936107635498,0.10542726516723633,0.10460448265075684,0.10406136512756348,0.10634016990661621,0.10710549354553223 diff --git a/results/combined/merges_timed/vandurme/jerboa.csv b/results/combined/merges_timed/vandurme/jerboa.csv index 12a32c0122..d4e3ed0f59 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,Tests_passed,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,True,45,259,1260,2,True,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,True,45,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,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Tests_failed,c812b70eed7120580b5a83568f6cbc0b613b1b69e996da5eb2fdaf80cea455aa,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,915a0e765eef00bd7c24bf788726affdc7d1a3bd859ba8d38f965495ee60f9dc,Tests_failed,0e22448f7664c600af0f5a47121d4581acbfcf54acf2e4d85d6f854d94ad327b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,0.013466358184814453,0.013352394104003906,0.014047384262084961,0.021880388259887695,0.013547420501708984,0.013590097427368164,0.01409912109375,0.03936266899108887,0.07443594932556152,0.7072696685791016,0.8112771511077881,0.04816722869873047,0.05002307891845703,0.05023336410522461,0.06302666664123535,0.06614828109741211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,Tests_passed,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,True,45,259,1260,2,True,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,True,45,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,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Tests_failed,c812b70eed7120580b5a83568f6cbc0b613b1b69e996da5eb2fdaf80cea455aa,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,915a0e765eef00bd7c24bf788726affdc7d1a3bd859ba8d38f965495ee60f9dc,Tests_failed,0e22448f7664c600af0f5a47121d4581acbfcf54acf2e4d85d6f854d94ad327b,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,0478d0b13b7a8224900539040383efd8dd7a1cef7862fea2c0dd3eefb8e800b8,Tests_passed,81810b79ef6539be1a79dee47dd8182e8c9a865d48f7643b2e4965b40713eff8,0.013466358184814453,0.013352394104003906,0.014047384262084961,0.021880388259887695,0.013547420501708984,0.013590097427368164,0.01409912109375,0.03936266899108887,0.07443594932556152,0.7072696685791016,0.8112771511077881,0.04816722869873047,0.05002307891845703,0.05023336410522461,0.06302666664123535,0.06614828109741211,0.06385326385498047,0.06236147880554199,0.0638585090637207,0.0652170181274414,0.06546330451965332,0.0614316463470459,0.0635988712310791,0.09626269340515137,0.10613226890563965,0.800572395324707,0.8888411521911621,0.06481623649597168,0.06244826316833496,0.06484270095825195,0.06109261512756348,0.06190800666809082 diff --git a/results/combined/merges_timed/vanduynslagerp/enml4j.csv b/results/combined/merges_timed/vanduynslagerp/enml4j.csv index e018f07d8e..0342a460c3 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,True,True,Tests_passed,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,True,17,156,697,2,True,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,True,17,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,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,5f012db46c7b496c506d237dab7172bc75d4d5d348bb1f6f9b0b8d26a217a564,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,0.01658010482788086,0.01620030403137207,0.018276214599609375,0.030363082885742188,0.009918451309204102,0.01844024658203125,0.0188751220703125,0.04689216613769531,0.06923103332519531,0.5234501361846924,0.472548246383667,0.04146385192871094,0.044297218322753906,0.04339337348937988,0.043871402740478516,0.04404425621032715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,True,True,Tests_passed,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,True,17,156,697,2,True,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,True,17,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,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,5f012db46c7b496c506d237dab7172bc75d4d5d348bb1f6f9b0b8d26a217a564,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,0.01658010482788086,0.01620030403137207,0.018276214599609375,0.030363082885742188,0.009918451309204102,0.01844024658203125,0.0188751220703125,0.04689216613769531,0.06923103332519531,0.5234501361846924,0.472548246383667,0.04146385192871094,0.044297218322753906,0.04339337348937988,0.043871402740478516,0.04404425621032715,0.04180407524108887,0.04235506057739258,0.04181337356567383,0.05409979820251465,0.05323433876037598,0.04181241989135742,0.042261600494384766,0.07449769973754883,0.09506011009216309,0.570415735244751,0.5158214569091797,0.042481184005737305,0.04084610939025879,0.05396676063537598,0.054396629333496094,0.04146456718444824 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 1af44bc6a6..f741a964a9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,True,True,True,24,73,1496,2,True,24,Tests_passed,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,True,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,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,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,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,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,6ff4e1ce2c9382bf92136d832091f2341f5bbfcfdc9197f1192a4b256b69f412,Tests_failed,71cf445628914864a0879e88f6f3bc6b0093e429f51d3d922465730af2994b88,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,0.051877737045288086,0.05070304870605469,0.050154685974121094,0.023261308670043945,0.0465235710144043,0.057256221771240234,0.061745405197143555,0.2005906105041504,0.11813163757324219,1.837486982345581,0.6309425830841064,0.04165482521057129,0.08409881591796875,0.04208993911743164,0.08151078224182129,0.08344864845275879 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,True,True,True,24,73,1496,2,True,24,Tests_passed,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,True,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,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,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,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,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,6ff4e1ce2c9382bf92136d832091f2341f5bbfcfdc9197f1192a4b256b69f412,Tests_failed,71cf445628914864a0879e88f6f3bc6b0093e429f51d3d922465730af2994b88,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,0.051877737045288086,0.05070304870605469,0.050154685974121094,0.023261308670043945,0.0465235710144043,0.057256221771240234,0.061745405197143555,0.2005906105041504,0.11813163757324219,1.837486982345581,0.6309425830841064,0.04165482521057129,0.08409881591796875,0.04208993911743164,0.08151078224182129,0.08344864845275879,0.08151888847351074,0.08195972442626953,0.08267068862915039,0.08083653450012207,0.07920217514038086,0.08228278160095215,0.09151482582092285,0.11602282524108887,0.11153578758239746,1.8634817600250244,0.6789183616638184,0.07967305183410645,0.08147048950195312,0.08010125160217285,0.08032512664794922,0.07803225517272949 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 c703dc4125..3b349aa4c9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,True,40,101,797,2,True,40,Tests_passed,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,True,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,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,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Tests_failed,20c9dc28359056a064f47fc783e7ddb6fdc9ae3eebbedd83db235d249679b9d7,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,355eed8395771b7caab92388767986259d64cb11517220fa739415a56bb0eac0,Tests_failed,bbbd71a67d0e29d3b3609b66ff424418c84681b2cca6b57b27587375ef2d3a9c,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,0.01454615592956543,0.03885698318481445,0.020694494247436523,0.01843714714050293,0.04478120803833008,0.04912161827087402,0.03902077674865723,0.04634284973144531,0.10519623756408691,0.9757688045501709,0.46628332138061523,0.06763458251953125,0.07480096817016602,0.05061006546020508,0.07384085655212402,0.07596683502197266 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,True,40,101,797,2,True,40,Tests_passed,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,True,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,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,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Tests_failed,20c9dc28359056a064f47fc783e7ddb6fdc9ae3eebbedd83db235d249679b9d7,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,355eed8395771b7caab92388767986259d64cb11517220fa739415a56bb0eac0,Tests_failed,bbbd71a67d0e29d3b3609b66ff424418c84681b2cca6b57b27587375ef2d3a9c,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,203274eb12a463b5ab201f51bab59bf48eae1be60dee1fa2eae15ff23605abc1,Tests_passed,495c883b369256f80d8b72961712a73848049de3977a56166f15cf5aa111f3f1,0.01454615592956543,0.03885698318481445,0.020694494247436523,0.01843714714050293,0.04478120803833008,0.04912161827087402,0.03902077674865723,0.04634284973144531,0.10519623756408691,0.9757688045501709,0.46628332138061523,0.06763458251953125,0.07480096817016602,0.05061006546020508,0.07384085655212402,0.07596683502197266,0.07595586776733398,0.07530808448791504,0.07417130470275879,0.07578849792480469,0.07545733451843262,0.07369112968444824,0.0731196403503418,0.1065363883972168,0.10947346687316895,1.1115624904632568,0.5815098285675049,0.07520055770874023,0.07207894325256348,0.07172131538391113,0.07402300834655762,0.07226705551147461 diff --git a/results/combined/merges_timed/vdurmont/emoji-java.csv b/results/combined/merges_timed/vdurmont/emoji-java.csv index 24ed6a2cf1..d089b5e3dd 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,False,True,6,15,1799,3,True,6,Tests_passed,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,True,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,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,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Tests_failed,c5815305e7a225afe29e0f8aabd52000cdb462188ab69830453840773ad66d30,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,2e70981491e2be630c561b1725ad1f2a14e095aea5484e64b965935e8ddbc540,Merge_failed,5423e17527d5757d1542a0bfebee05cbffda28948d479895d63a6ab06a728962,Merge_failed,65e219aa0d012cc14fe8bd3968877599b896bd54945a9a983667d6db3a80c08d,Tests_failed,c83b1d14805c621bfd7a2667bb9978a81ec6199850028b3a147be6bb4764f79e,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.024763822555541992,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.18066668510437012,0.6428718566894531,0.30562877655029297,0.05368542671203613,0.11460161209106445,0.05307173728942871,0.11349344253540039,0.11411619186401367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,False,True,6,15,1799,3,True,6,Tests_passed,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,True,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,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,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Tests_failed,c5815305e7a225afe29e0f8aabd52000cdb462188ab69830453840773ad66d30,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,2e70981491e2be630c561b1725ad1f2a14e095aea5484e64b965935e8ddbc540,Merge_failed,5423e17527d5757d1542a0bfebee05cbffda28948d479895d63a6ab06a728962,Merge_failed,65e219aa0d012cc14fe8bd3968877599b896bd54945a9a983667d6db3a80c08d,Tests_failed,c83b1d14805c621bfd7a2667bb9978a81ec6199850028b3a147be6bb4764f79e,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,Merge_failed,41a38fa51c531bd2993359fe50f3becb6e23ef2ba3008d1a6b5eaecee755a6bd,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.024763822555541992,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.18066668510437012,0.6428718566894531,0.30562877655029297,0.05368542671203613,0.11460161209106445,0.05307173728942871,0.11349344253540039,0.11411619186401367,0.11282038688659668,0.10588550567626953,0.10971212387084961,0.10694432258605957,0.10907721519470215,0.11175966262817383,0.1112968921661377,0.16255784034729004,0.1691877841949463,0.7093455791473389,0.4141390323638916,0.10724091529846191,0.10748481750488281,0.11069393157958984,0.11184144020080566,0.10770654678344727 diff --git a/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv b/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv index 7b673145f5..b8b5446384 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,Tests_passed,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,True,6,11,95,4,True,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,True,6,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,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,0b0808fa8652e2c66b626806b42dd0b8fe2c967bcf9be0d438abbdeb048e4e43,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.014450550079345703,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.21962833404541016,2.4249777793884277,0.5019302368164062,0.030873537063598633,0.09691333770751953,0.03066706657409668,0.09828567504882812,0.09561300277709961 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,Tests_passed,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,True,6,11,95,4,True,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,True,6,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,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,0b0808fa8652e2c66b626806b42dd0b8fe2c967bcf9be0d438abbdeb048e4e43,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,Tests_passed,b5b04e2f0f8dd9219607b24b546d5f7af4a0fe18655c07c855e8f456fe7d44dd,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.014450550079345703,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.21962833404541016,2.4249777793884277,0.5019302368164062,0.030873537063598633,0.09691333770751953,0.03066706657409668,0.09828567504882812,0.09561300277709961,0.0916285514831543,0.09149026870727539,0.0922861099243164,0.09265422821044922,0.09297776222229004,0.09336519241333008,0.0924983024597168,0.15809226036071777,0.16822123527526855,2.491893768310547,0.528069257736206,0.09339356422424316,0.09094047546386719,0.09320354461669922,0.09118175506591797,0.09154629707336426 diff --git a/results/combined/merges_timed/verhas/djcproxy.csv b/results/combined/merges_timed/verhas/djcproxy.csv index 091e2c8e0a..06ec5a5e82 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,True,True,Tests_passed,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,True,5,8,77,2,True,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,True,5,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,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,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,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c2eca3c229c65b5dbee308fae585389ae42f9788fed03e9be05b70992e07d93c,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,0.04162335395812988,0.043466806411743164,0.04169106483459473,0.014760017395019531,0.040949344635009766,0.03909754753112793,0.04338645935058594,0.16414308547973633,0.10923171043395996,0.8765342235565186,0.4279754161834717,0.028823375701904297,0.05468463897705078,0.029375791549682617,0.054006099700927734,0.05486249923706055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,True,True,Tests_passed,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,True,5,8,77,2,True,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,True,5,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,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,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,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c2eca3c229c65b5dbee308fae585389ae42f9788fed03e9be05b70992e07d93c,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,0.04162335395812988,0.043466806411743164,0.04169106483459473,0.014760017395019531,0.040949344635009766,0.03909754753112793,0.04338645935058594,0.16414308547973633,0.10923171043395996,0.8765342235565186,0.4279754161834717,0.028823375701904297,0.05468463897705078,0.029375791549682617,0.054006099700927734,0.05486249923706055,0.051506996154785156,0.05317282676696777,0.05280137062072754,0.05252718925476074,0.05295085906982422,0.05319046974182129,0.05281805992126465,0.08503413200378418,0.0863640308380127,0.9003050327301025,0.4497339725494385,0.05328011512756348,0.05181527137756348,0.05142521858215332,0.053681373596191406,0.05218982696533203 diff --git a/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv b/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv index dfab71ed59..fe45aa452e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,False,True,3,12,47,2,True,3,Tests_passed,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,True,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,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,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,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,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,8bb5f2116e813c1caa7658bc4da3aa4baf4516f089c4d0df02e558fd0ee4bf69,Tests_failed,78f72d1e286e5cdd598b7d1b0aa43d34ef328e760cb4752d3da19f33eed15b1a,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,0.04193258285522461,0.042113542556762695,0.05091404914855957,0.015560388565063477,0.05039048194885254,0.04601478576660156,0.05202293395996094,0.15494632720947266,0.11756205558776855,0.6794338226318359,0.2644209861755371,0.03247189521789551,0.05623984336853027,0.03270602226257324,0.05495905876159668,0.05430722236633301 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,False,True,3,12,47,2,True,3,Tests_passed,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,True,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,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,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,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,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,8bb5f2116e813c1caa7658bc4da3aa4baf4516f089c4d0df02e558fd0ee4bf69,Tests_failed,78f72d1e286e5cdd598b7d1b0aa43d34ef328e760cb4752d3da19f33eed15b1a,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,0.04193258285522461,0.042113542556762695,0.05091404914855957,0.015560388565063477,0.05039048194885254,0.04601478576660156,0.05202293395996094,0.15494632720947266,0.11756205558776855,0.6794338226318359,0.2644209861755371,0.03247189521789551,0.05623984336853027,0.03270602226257324,0.05495905876159668,0.05430722236633301,0.05404233932495117,0.05318593978881836,0.05367779731750488,0.05471634864807129,0.05386924743652344,0.05568528175354004,0.056650638580322266,0.08747291564941406,0.08425354957580566,0.7202818393707275,0.2892417907714844,0.05444908142089844,0.054845333099365234,0.055145978927612305,0.05441474914550781,0.05119967460632324 diff --git a/results/combined/merges_timed/vert-x3/docgen.csv b/results/combined/merges_timed/vert-x3/docgen.csv index 3f48d0a37c..87118c797e 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,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_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_failed,71ade9d299fc4b56979497d2f132739a3e1ee43a9b40c4e4435ae678a5a311b8,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,0.039632558822631836,0.033168792724609375,0.040204763412475586,0.017456531524658203,0.049410104751586914,0.051752328872680664,0.04147982597351074,0.22783756256103516,0.18182826042175293,2.2788164615631104,0.390169620513916,0.034253835678100586,0.07903409004211426,0.03370809555053711,0.08177661895751953,0.0819082260131836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,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_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_failed,71ade9d299fc4b56979497d2f132739a3e1ee43a9b40c4e4435ae678a5a311b8,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,0.039632558822631836,0.033168792724609375,0.040204763412475586,0.017456531524658203,0.049410104751586914,0.051752328872680664,0.04147982597351074,0.22783756256103516,0.18182826042175293,2.2788164615631104,0.390169620513916,0.034253835678100586,0.07903409004211426,0.03370809555053711,0.08177661895751953,0.0819082260131836,0.0793752670288086,0.0805349349975586,0.08124518394470215,0.08268117904663086,0.07901215553283691,0.08322501182556152,0.08143877983093262,0.13327574729919434,0.1397542953491211,2.634312152862549,0.4374961853027344,0.08103609085083008,0.08023929595947266,0.0811605453491211,0.08042788505554199,0.0804896354675293 diff --git a/results/combined/merges_timed/vert-x3/vertx-docgen.csv b/results/combined/merges_timed/vert-x3/vertx-docgen.csv index 3877f32576..bbc2388ada 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,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_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_failed,71ade9d299fc4b56979497d2f132739a3e1ee43a9b40c4e4435ae678a5a311b8,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,0.0450742244720459,0.04598569869995117,0.04983186721801758,0.018415212631225586,0.04552650451660156,0.05417299270629883,0.0391542911529541,0.22362971305847168,0.1682429313659668,2.273361921310425,0.3808627128601074,0.03429555892944336,0.07996201515197754,0.03357076644897461,0.08010196685791016,0.08399152755737305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,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_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_failed,71ade9d299fc4b56979497d2f132739a3e1ee43a9b40c4e4435ae678a5a311b8,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,Tests_passed,e028ea1028b02823d5a85126ee25ab5494a11a3b9e37daf18f61a52e82344a9d,0.0450742244720459,0.04598569869995117,0.04983186721801758,0.018415212631225586,0.04552650451660156,0.05417299270629883,0.0391542911529541,0.22362971305847168,0.1682429313659668,2.273361921310425,0.3808627128601074,0.03429555892944336,0.07996201515197754,0.03357076644897461,0.08010196685791016,0.08399152755737305,0.08112335205078125,0.07972288131713867,0.08100509643554688,0.08302998542785645,0.08050298690795898,0.0810995101928711,0.08267521858215332,0.13517260551452637,0.13730764389038086,2.5882532596588135,0.4439866542816162,0.08015656471252441,0.08101463317871094,0.0807332992553711,0.08079099655151367,0.0806877613067627 diff --git a/results/combined/merges_timed/vidstige/jadb.csv b/results/combined/merges_timed/vidstige/jadb.csv index 17b2191747..297dc59256 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,True,True,True,20,61,165,3,True,20,Tests_passed,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,True,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,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,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,0.05410313606262207,0.03744101524353027,0.06272554397583008,0.02547740936279297,0.057993412017822266,0.06374335289001465,0.03536367416381836,0.2735469341278076,0.16875863075256348,0.04860877990722656,0.5869932174682617,0.048297882080078125,0.09506464004516602,0.05064845085144043,0.09399271011352539,0.09501504898071289 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,True,True,True,20,61,165,3,True,20,Tests_passed,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,True,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,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,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,Tests_passed,5777c1b2a7477b5c2346bea0f2ccaebb4ab57750d9cc33e936f8e83a2f11ebea,0.05410313606262207,0.03744101524353027,0.06272554397583008,0.02547740936279297,0.057993412017822266,0.06374335289001465,0.03536367416381836,0.2735469341278076,0.16875863075256348,0.04860877990722656,0.5869932174682617,0.048297882080078125,0.09506464004516602,0.05064845085144043,0.09399271011352539,0.09501504898071289,0.08828949928283691,0.08893632888793945,0.09258031845092773,0.09358382225036621,0.09357666969299316,0.09280824661254883,0.09366917610168457,0.15154790878295898,0.14803767204284668,0.1079864501953125,0.614234209060669,0.0910496711730957,0.09070801734924316,0.09007549285888672,0.0909261703491211,0.09046721458435059 diff --git a/results/combined/merges_timed/vietj/modsh.csv b/results/combined/merges_timed/vietj/modsh.csv index 418b1fbefa..ca8ca19b4d 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,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,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,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,747bf387f35079a35888b899de8269808e9132fcf7f48a3d3c6b5b1f8972c40a,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,0.019367218017578125,0.019985675811767578,0.0249330997467041,0.035471200942993164,0.02405095100402832,0.024149656295776367,0.026101350784301758,0.05353283882141113,0.07450437545776367,0.6215226650238037,0.6777863502502441,0.05776405334472656,0.08113408088684082,0.06167006492614746,0.08160996437072754,0.08426356315612793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,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,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,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,747bf387f35079a35888b899de8269808e9132fcf7f48a3d3c6b5b1f8972c40a,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,0.019367218017578125,0.019985675811767578,0.0249330997467041,0.035471200942993164,0.02405095100402832,0.024149656295776367,0.026101350784301758,0.05353283882141113,0.07450437545776367,0.6215226650238037,0.6777863502502441,0.05776405334472656,0.08113408088684082,0.06167006492614746,0.08160996437072754,0.08426356315612793,0.08043837547302246,0.08015847206115723,0.09334206581115723,0.09157013893127441,0.08726644515991211,0.08536243438720703,0.08427238464355469,0.12632536888122559,0.11173844337463379,0.7776374816894531,0.7770838737487793,0.08434009552001953,0.08502411842346191,0.0853128433227539,0.06522488594055176,0.08103561401367188 diff --git a/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv b/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv index ca7f957eda..01fa1e26af 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,True,12,22,324,4,True,12,Tests_passed,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,True,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,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,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,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,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,8be35d213c07b0ef834ca9990af8506a071c334f8a0506b68aec9dd28bb76174,Tests_failed,b43f25d5e22e57b61f4494439186b5d9ec24a3440519d729b95f4a1dc794c375,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,0.008170604705810547,0.008087873458862305,0.008167028427124023,0.013985157012939453,0.008495092391967773,0.008467435836791992,0.008624792098999023,0.05395793914794922,0.16842985153198242,1.6654281616210938,0.2851221561431885,0.029572248458862305,0.08607196807861328,0.028543949127197266,0.08789992332458496,0.08515667915344238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,True,12,22,324,4,True,12,Tests_passed,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,True,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,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,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,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,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,8be35d213c07b0ef834ca9990af8506a071c334f8a0506b68aec9dd28bb76174,Tests_failed,b43f25d5e22e57b61f4494439186b5d9ec24a3440519d729b95f4a1dc794c375,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,0.008170604705810547,0.008087873458862305,0.008167028427124023,0.013985157012939453,0.008495092391967773,0.008467435836791992,0.008624792098999023,0.05395793914794922,0.16842985153198242,1.6654281616210938,0.2851221561431885,0.029572248458862305,0.08607196807861328,0.028543949127197266,0.08789992332458496,0.08515667915344238,0.08238053321838379,0.08246207237243652,0.08146357536315918,0.08028817176818848,0.08179044723510742,0.08237504959106445,0.08086109161376953,0.14401555061340332,0.15769219398498535,1.8212275505065918,0.30468320846557617,0.08053874969482422,0.08174514770507812,0.08226776123046875,0.08178830146789551,0.08217549324035645 diff --git a/results/combined/merges_timed/vipshop/saturn.csv b/results/combined/merges_timed/vipshop/saturn.csv index c22d7f235c..0b163b48e9 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,True,33,101,2917.0,2,True,33,Tests_passed,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,True,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,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,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_failed,cf6cf5b64dc559b25eb46db144e716e3b701c8c2b055ef3fe12bad3f24df7089,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,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,42d6b5414e4f6aeba00cef4403cabf30e7340ece39bb54a1b870d42232fd3cd7,Tests_failed,63904c650adae8faf6b73d6997c12e3056d306164bf99d495dcde573ad78cab7,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.02678823471069336,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.11674165725708008,1.4250233173370361,0.9253385066986084,0.04981112480163574,0.07989192008972168,0.049775123596191406,0.07607078552246094,0.07901692390441895 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,True,33,101,2917.0,2,True,33,Tests_passed,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,True,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,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,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_failed,cf6cf5b64dc559b25eb46db144e716e3b701c8c2b055ef3fe12bad3f24df7089,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,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,42d6b5414e4f6aeba00cef4403cabf30e7340ece39bb54a1b870d42232fd3cd7,Tests_failed,63904c650adae8faf6b73d6997c12e3056d306164bf99d495dcde573ad78cab7,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.02678823471069336,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.11674165725708008,1.4250233173370361,0.9253385066986084,0.04981112480163574,0.07989192008972168,0.049775123596191406,0.07607078552246094,0.07901692390441895,0.07462096214294434,0.07518267631530762,0.07824945449829102,0.07876324653625488,0.07725787162780762,0.0762944221496582,0.07552766799926758,0.11464357376098633,0.10928630828857422,1.3926258087158203,0.9337656497955322,0.07590961456298828,0.07446861267089844,0.07297897338867188,0.07545113563537598,0.07552313804626465 diff --git a/results/combined/merges_timed/vkostyukov/la4j.csv b/results/combined/merges_timed/vkostyukov/la4j.csv index b7a8faf717..ba835d716e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,True,True,True,4,6,40,2,True,4,Tests_passed,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,True,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,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,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,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,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,e7ef02d3c73e5d5956534f663d56852d26ec4d6125739bd503024f9ebae17e25,Tests_failed,563ad21be38ad3865522fc33dd85c087e6aa2672badcaf514016a486a9a51784,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,0.0442049503326416,0.015281915664672852,0.04570651054382324,0.024425983428955078,0.0417637825012207,0.03204703330993652,0.03085494041442871,0.1573173999786377,0.08864712715148926,1.355109691619873,0.6453044414520264,0.043946266174316406,0.07193756103515625,0.04456806182861328,0.07110452651977539,0.07235336303710938 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,True,True,True,4,6,40,2,True,4,Tests_passed,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,True,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,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,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,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,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,e7ef02d3c73e5d5956534f663d56852d26ec4d6125739bd503024f9ebae17e25,Tests_failed,563ad21be38ad3865522fc33dd85c087e6aa2672badcaf514016a486a9a51784,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,0.0442049503326416,0.015281915664672852,0.04570651054382324,0.024425983428955078,0.0417637825012207,0.03204703330993652,0.03085494041442871,0.1573173999786377,0.08864712715148926,1.355109691619873,0.6453044414520264,0.043946266174316406,0.07193756103515625,0.04456806182861328,0.07110452651977539,0.07235336303710938,0.06176424026489258,0.06428098678588867,0.07085990905761719,0.07098150253295898,0.06837153434753418,0.0722208023071289,0.07253694534301758,0.10517191886901855,0.1006157398223877,1.3737850189208984,0.6763439178466797,0.06878137588500977,0.0578615665435791,0.06770849227905273,0.06762194633483887,0.06800460815429688 diff --git a/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv b/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv index e780594043..ac001e3a94 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -43,refs/heads/main,8b71d6eb351b292eb27460955cba6aca5939e3cc,c08bbaae91b9e4b7903b5435796a4956d2ebcff5,8de1ab469c2adbab43ed2c0dd503f2f9918902f0,,True,True,Tests_passed,3a8f423667ee282dd740b01c9105d4369e7bde5522dcbac0fb0d84407679eec4,True,14,57,280,2,True,Tests_passed,16e909dbaa8a76a5445b0bbb1a5a9708bfb65de4d4a14ff795b310d1806ee8e0,True,14,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,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_failed,616f94e44505cfcac52a45ebd33187ac3ea48ec336e3ded9e62876ad1491dbc0,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,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_failed,616f94e44505cfcac52a45ebd33187ac3ea48ec336e3ded9e62876ad1491dbc0,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,0.0482325553894043,0.04230761528015137,0.055707454681396484,0.06597781181335449,0.05772089958190918,0.054230690002441406,0.0130767822265625,0.15918469429016113,0.11407947540283203,0.04871940612792969,0.5788002014160156,0.10465097427368164,0.07377743721008301,0.10350489616394043,0.06082582473754883,0.12813544273376465 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +43,refs/heads/main,8b71d6eb351b292eb27460955cba6aca5939e3cc,c08bbaae91b9e4b7903b5435796a4956d2ebcff5,8de1ab469c2adbab43ed2c0dd503f2f9918902f0,,True,True,Tests_passed,3a8f423667ee282dd740b01c9105d4369e7bde5522dcbac0fb0d84407679eec4,True,14,57,280,2,True,Tests_passed,16e909dbaa8a76a5445b0bbb1a5a9708bfb65de4d4a14ff795b310d1806ee8e0,True,14,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,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_failed,616f94e44505cfcac52a45ebd33187ac3ea48ec336e3ded9e62876ad1491dbc0,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,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_failed,616f94e44505cfcac52a45ebd33187ac3ea48ec336e3ded9e62876ad1491dbc0,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,0.0482325553894043,0.04230761528015137,0.055707454681396484,0.06597781181335449,0.05772089958190918,0.054230690002441406,0.0130767822265625,0.15918469429016113,0.11407947540283203,0.04871940612792969,0.5788002014160156,0.10465097427368164,0.07377743721008301,0.10350489616394043,0.06082582473754883,0.12813544273376465,0.1294269561767578,0.061208248138427734,0.1421821117401123,0.06153559684753418,0.14873003959655762,0.1468040943145752,0.060567617416381836,0.20049381256103516,0.17890167236328125,0.07448005676269531,0.7014617919921875,0.08104276657104492,0.12987065315246582,0.059859275817871094,0.12760305404663086,0.06055808067321777 diff --git a/results/combined/merges_timed/vt-middleware/cryptacular.csv b/results/combined/merges_timed/vt-middleware/cryptacular.csv index ddd1c16d26..e81f20a6c3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,True,26,62,1046,3,True,26,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,True,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,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,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,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_failed,fd211bf4afd9c5d8af90f1d32a6f8c82144a78545988a374f4fb9603bd2b763d,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,0.03758358955383301,0.0458371639251709,0.052614450454711914,0.026058435440063477,0.05359387397766113,0.04848599433898926,0.02736949920654297,0.23956990242004395,0.14471793174743652,0.03748965263366699,0.5070233345031738,0.04516267776489258,0.0812232494354248,0.050565481185913086,0.0827031135559082,0.09653949737548828 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,True,26,62,1046,3,True,26,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,True,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,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,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,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_failed,fd211bf4afd9c5d8af90f1d32a6f8c82144a78545988a374f4fb9603bd2b763d,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,0.03758358955383301,0.0458371639251709,0.052614450454711914,0.026058435440063477,0.05359387397766113,0.04848599433898926,0.02736949920654297,0.23956990242004395,0.14471793174743652,0.03748965263366699,0.5070233345031738,0.04516267776489258,0.0812232494354248,0.050565481185913086,0.0827031135559082,0.09653949737548828,0.10139870643615723,0.09021973609924316,0.08663153648376465,0.10665416717529297,0.08739781379699707,0.10286068916320801,0.10936307907104492,0.14323854446411133,0.15159821510314941,1.7887792587280273,0.6004645824432373,0.10091829299926758,0.08562278747558594,0.08793926239013672,0.1018228530883789,0.08453750610351562 diff --git a/results/combined/merges_timed/w3c/ldp-testsuite.csv b/results/combined/merges_timed/w3c/ldp-testsuite.csv index aaacaabdd4..ceec221472 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -49,refs/heads/master,a7515238ae8139c8d6b2ee7e042183294ca3869f,9f71b5fb60327dce3a35fe585722902387facd37,0a602bc5ba8375d431ae17943031105efccee35e,,True,True,True,3,24,204,9,True,10,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,True,Tests_passed,ab96cdde264ef12327ac54084e02cae4da522374bb1825c9ba952a511ea20d7a,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_failed,3a2a72648ba73f8ec331a02fce28c66ca52b8ec24ea80e9d50a70a6135b2c873,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,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_failed,3a2a72648ba73f8ec331a02fce28c66ca52b8ec24ea80e9d50a70a6135b2c873,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,0.0219271183013916,0.052010536193847656,0.03831362724304199,0.019443273544311523,0.03878211975097656,0.03774404525756836,0.03984546661376953,0.10372352600097656,0.03979754447937012,0.03509664535522461,0.7387981414794922,0.04378366470336914,0.06758666038513184,0.040876150131225586,0.06796479225158691,0.06992673873901367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +49,refs/heads/master,a7515238ae8139c8d6b2ee7e042183294ca3869f,9f71b5fb60327dce3a35fe585722902387facd37,0a602bc5ba8375d431ae17943031105efccee35e,,True,True,True,3,24,204,9,True,10,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,True,Tests_passed,ab96cdde264ef12327ac54084e02cae4da522374bb1825c9ba952a511ea20d7a,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_failed,3a2a72648ba73f8ec331a02fce28c66ca52b8ec24ea80e9d50a70a6135b2c873,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,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_failed,3a2a72648ba73f8ec331a02fce28c66ca52b8ec24ea80e9d50a70a6135b2c873,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,0.0219271183013916,0.052010536193847656,0.03831362724304199,0.019443273544311523,0.03878211975097656,0.03774404525756836,0.03984546661376953,0.10372352600097656,0.03979754447937012,0.03509664535522461,0.7387981414794922,0.04378366470336914,0.06758666038513184,0.040876150131225586,0.06796479225158691,0.06992673873901367,0.06742024421691895,0.07052898406982422,0.06917262077331543,0.06970071792602539,0.06870460510253906,0.06763529777526855,0.06833791732788086,0.08786797523498535,0.08241462707519531,0.08648467063903809,0.9119677543640137,0.06866621971130371,0.07056474685668945,0.06879520416259766,0.07033514976501465,0.06671476364135742 diff --git a/results/combined/merges_timed/wakaleo/game-of-life.csv b/results/combined/merges_timed/wakaleo/game-of-life.csv index 506dc6234b..f7e9653f49 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,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,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,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,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_timedout,193ce087088d6884fb085f8a57e282854be2086b10d011123c353eeb85fbf48a,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.021025896072387695,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.13115763664245605,0.6045498847961426,0.2942514419555664,0.04272031784057617,0.06760168075561523,0.04116654396057129,0.06708478927612305,0.06641602516174316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,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,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,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,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_timedout,193ce087088d6884fb085f8a57e282854be2086b10d011123c353eeb85fbf48a,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.021025896072387695,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.13115763664245605,0.6045498847961426,0.2942514419555664,0.04272031784057617,0.06760168075561523,0.04116654396057129,0.06708478927612305,0.06641602516174316,0.06200528144836426,0.06446003913879395,0.06496500968933105,0.06476974487304688,0.06493806838989258,0.06462836265563965,0.06536698341369629,0.10203814506530762,0.09626460075378418,0.6139657497406006,0.3301825523376465,0.06308269500732422,0.0633399486541748,0.06427383422851562,0.06421256065368652,0.0626223087310791 diff --git a/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv b/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv index 25455a4e47..61dec58d09 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,True,True,True,6,15,79,2,True,6,Tests_passed,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,True,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,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,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,4e279a9e3eb203cf5310a0d38688856e30b8706d91317c89f9badf14215e5019,Tests_failed,c30f6d8a023e6d7f77fbf8a764b0b1006ffe2119bcb9e9b2b7a436324cb21dc4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,0.04195451736450195,0.0433809757232666,0.03959465026855469,0.014154672622680664,0.04206418991088867,0.04266238212585449,0.0403292179107666,0.1580033302307129,0.11315464973449707,0.4482738971710205,0.292604923248291,0.02970290184020996,0.05385470390319824,0.029958009719848633,0.053112030029296875,0.05375409126281738 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,True,True,True,6,15,79,2,True,6,Tests_passed,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,True,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,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,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,4e279a9e3eb203cf5310a0d38688856e30b8706d91317c89f9badf14215e5019,Tests_failed,c30f6d8a023e6d7f77fbf8a764b0b1006ffe2119bcb9e9b2b7a436324cb21dc4,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,3095ab0bddb1a4cdb275716afc90f92d516181ccd74ccbf5556137abb2a05e92,Tests_passed,08e4bd83ff9e3f6c1a97796f6dfd242a7e5a3337727de337e3d4820cd6a99176,0.04195451736450195,0.0433809757232666,0.03959465026855469,0.014154672622680664,0.04206418991088867,0.04266238212585449,0.0403292179107666,0.1580033302307129,0.11315464973449707,0.4482738971710205,0.292604923248291,0.02970290184020996,0.05385470390319824,0.029958009719848633,0.053112030029296875,0.05375409126281738,0.054273366928100586,0.05396676063537598,0.053607940673828125,0.05421805381774902,0.05362820625305176,0.05552935600280762,0.05420827865600586,0.08644795417785645,0.08424162864685059,0.5101237297058105,0.34020233154296875,0.055582523345947266,0.05478215217590332,0.05322003364562988,0.053391218185424805,0.05405378341674805 diff --git a/results/combined/merges_timed/wasdev/ci.ant.csv b/results/combined/merges_timed/wasdev/ci.ant.csv index e9b786bb2d..5e51a83dc8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,True,21,132,856,3,True,21,Tests_passed,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,True,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,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,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,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,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,04b1d4f3ef2bf947d920b3dbb245af1197b2a7618914f46c2514b52df61b9ff9,Tests_failed,482ae4cb60c7c73bd7958de7414d7558d6daf25077d8f3b1bb55c03f221d62ec,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,0.011378288269042969,0.011291980743408203,0.012219905853271484,0.019881486892700195,0.012295722961425781,0.012592554092407227,0.012549638748168945,0.05019116401672363,0.1192014217376709,0.908545732498169,0.5665676593780518,0.03622245788574219,0.08283853530883789,0.03630399703979492,0.08229708671569824,0.08189821243286133 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,True,21,132,856,3,True,21,Tests_passed,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,True,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,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,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,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,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,04b1d4f3ef2bf947d920b3dbb245af1197b2a7618914f46c2514b52df61b9ff9,Tests_failed,482ae4cb60c7c73bd7958de7414d7558d6daf25077d8f3b1bb55c03f221d62ec,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,0.011378288269042969,0.011291980743408203,0.012219905853271484,0.019881486892700195,0.012295722961425781,0.012592554092407227,0.012549638748168945,0.05019116401672363,0.1192014217376709,0.908545732498169,0.5665676593780518,0.03622245788574219,0.08283853530883789,0.03630399703979492,0.08229708671569824,0.08189821243286133,0.08089947700500488,0.07778811454772949,0.07646870613098145,0.07969379425048828,0.0797567367553711,0.0783393383026123,0.07720947265625,0.13141512870788574,0.13387537002563477,1.0136752128601074,0.5888156890869141,0.07878684997558594,0.07980751991271973,0.07593536376953125,0.07679080963134766,0.08075857162475586 diff --git a/results/combined/merges_timed/wasdev/ci.maven.csv b/results/combined/merges_timed/wasdev/ci.maven.csv index 2e03202617..6734134138 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,False,True,8,15,37.0,2,True,8,Tests_passed,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,True,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,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,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,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,6bb80cdc5139f2be8f2f6afcd2906c5be72d2dee811acd8b66247a8c13d04375,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,0.05859780311584473,0.052454233169555664,0.06406116485595703,0.02532815933227539,0.058736562728881836,0.047368764877319336,0.03728127479553223,0.18810319900512695,0.12727832794189453,1.590374231338501,0.43297433853149414,0.04751324653625488,0.07759928703308105,0.046895742416381836,0.07787156105041504,0.07654094696044922 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,False,True,8,15,37.0,2,True,8,Tests_passed,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,True,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,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,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,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,6bb80cdc5139f2be8f2f6afcd2906c5be72d2dee811acd8b66247a8c13d04375,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,0.05859780311584473,0.052454233169555664,0.06406116485595703,0.02532815933227539,0.058736562728881836,0.047368764877319336,0.03728127479553223,0.18810319900512695,0.12727832794189453,1.590374231338501,0.43297433853149414,0.04751324653625488,0.07759928703308105,0.046895742416381836,0.07787156105041504,0.07654094696044922,0.076873779296875,0.07707524299621582,0.07528281211853027,0.07821965217590332,0.07574033737182617,0.07271695137023926,0.07567501068115234,0.1131436824798584,0.10455751419067383,1.566939115524292,0.47429680824279785,0.07750844955444336,0.07473421096801758,0.07691478729248047,0.07146930694580078,0.07137703895568848 diff --git a/results/combined/merges_timed/webbit/webbit.csv b/results/combined/merges_timed/webbit/webbit.csv index 91c488821a..5111e41d88 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,False,True,2.0,13,42.0,5,True,5,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,True,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,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_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,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,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,0.04013800621032715,0.009405136108398438,0.03176283836364746,0.04185223579406738,0.030933856964111328,0.03676414489746094,0.03541302680969238,0.10479474067687988,0.04031085968017578,0.04983162879943848,0.4364025592803955,0.09219694137573242,0.09247231483459473,0.09530305862426758,0.09425806999206543,0.09901881217956543 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,False,True,2.0,13,42.0,5,True,5,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,True,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,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_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,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,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,0.04013800621032715,0.009405136108398438,0.03176283836364746,0.04185223579406738,0.030933856964111328,0.03676414489746094,0.03541302680969238,0.10479474067687988,0.04031085968017578,0.04983162879943848,0.4364025592803955,0.09219694137573242,0.09247231483459473,0.09530305862426758,0.09425806999206543,0.09901881217956543,0.0898900032043457,0.08651614189147949,0.08748245239257812,0.09202742576599121,0.06109762191772461,0.09184622764587402,0.09179544448852539,0.11869478225708008,0.11741781234741211,0.11100482940673828,0.4772069454193115,0.09438204765319824,0.0920720100402832,0.09037375450134277,0.08688831329345703,0.09076929092407227 diff --git a/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv b/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv index 6cc5fd5ee5..df841bcdfd 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,True,True,Tests_passed,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,True,13,43,100,2,True,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,True,13,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,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,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,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,6b6f80025306639df4ef2e4b8f5a5ac7248d53ee46f828dade369efa5e8d2f04,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,0.04529261589050293,0.046320199966430664,0.05116868019104004,0.016290664672851562,0.04642295837402344,0.037297964096069336,0.047931671142578125,0.1682109832763672,0.12474727630615234,0.6643869876861572,0.32213616371154785,0.0319368839263916,0.0564274787902832,0.03279232978820801,0.056472063064575195,0.05670022964477539 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,True,True,Tests_passed,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,True,13,43,100,2,True,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,True,13,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,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,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,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,6b6f80025306639df4ef2e4b8f5a5ac7248d53ee46f828dade369efa5e8d2f04,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,0.04529261589050293,0.046320199966430664,0.05116868019104004,0.016290664672851562,0.04642295837402344,0.037297964096069336,0.047931671142578125,0.1682109832763672,0.12474727630615234,0.6643869876861572,0.32213616371154785,0.0319368839263916,0.0564274787902832,0.03279232978820801,0.056472063064575195,0.05670022964477539,0.05489802360534668,0.05259585380554199,0.05313372611999512,0.05580425262451172,0.05327177047729492,0.05476832389831543,0.05378580093383789,0.08696198463439941,0.08238959312438965,0.7080185413360596,0.3650338649749756,0.0553736686706543,0.05374622344970703,0.05506277084350586,0.05480766296386719,0.055109500885009766 diff --git a/results/combined/merges_timed/webjars/webjars-locator.csv b/results/combined/merges_timed/webjars/webjars-locator.csv index 43995fc1a6..486c1e8dce 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,Tests_passed,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,True,5,37,441,3,True,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,True,5,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,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Tests_passed,f8ebb7564e7b42a921c98b15883522585bf4417f84404fe4bfb7ddadec43f630,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,3daa166e9406e9de6254524abf9408979a8b843b7e3a01da0c527b1f28e3a897,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,07af8796e31557eb998a98fc707e1ca1159dadcda2c34e49e38a53f760b44f7d,Tests_passed,f4bbecd7b07b48888b58395213cb23598ae1f0a194a4554da878b8c6194528e6,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,0.031907081604003906,0.046518564224243164,0.03914976119995117,0.01386404037475586,0.038720130920410156,0.038645267486572266,0.03802347183227539,0.22913098335266113,0.17231273651123047,1.2847251892089844,0.4041433334350586,0.03831601142883301,0.05971646308898926,0.039359092712402344,0.06110334396362305,0.07084202766418457 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,Tests_passed,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,True,5,37,441,3,True,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,True,5,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,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Tests_passed,f8ebb7564e7b42a921c98b15883522585bf4417f84404fe4bfb7ddadec43f630,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,3daa166e9406e9de6254524abf9408979a8b843b7e3a01da0c527b1f28e3a897,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,07af8796e31557eb998a98fc707e1ca1159dadcda2c34e49e38a53f760b44f7d,Tests_passed,f4bbecd7b07b48888b58395213cb23598ae1f0a194a4554da878b8c6194528e6,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,0.031907081604003906,0.046518564224243164,0.03914976119995117,0.01386404037475586,0.038720130920410156,0.038645267486572266,0.03802347183227539,0.22913098335266113,0.17231273651123047,1.2847251892089844,0.4041433334350586,0.03831601142883301,0.05971646308898926,0.039359092712402344,0.06110334396362305,0.07084202766418457,0.05926656723022461,0.06833982467651367,0.06033658981323242,0.06898140907287598,0.06323719024658203,0.060887813568115234,0.05695939064025879,0.11035847663879395,0.11452817916870117,1.3630163669586182,0.4765796661376953,0.06024050712585449,0.06096625328063965,0.0615081787109375,0.06005978584289551,0.06806039810180664 diff --git a/results/combined/merges_timed/whizzosoftware/wzwave.csv b/results/combined/merges_timed/whizzosoftware/wzwave.csv index fbd8ee3ab7..3d9e70801f 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,False,True,3,8,44,6,True,6,Tests_passed,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,True,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,True,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,5703d69f10c3c746bc60870267019fff3aa3f5bc75d6079d5dc7b357afd49e71,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,Merge_failed,83c3c248686a0113fc22e01267add7cded101ecd27e72719dea5519d5e3e08a3,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,3ab3dfd7063a1144fe20771fb8718c939c930cbfa708a92c5e774efd62d3a052,Merge_failed,9020cf934efe255b1778eca184963dc64ed7da1c4d49120c5e019f078516863f,Merge_failed,9c1abd916b2afc31150d0065a4f5e39dd989be8ac56244dd6bd836ee8b08df9b,Tests_failed,2311a3f4da38b68dba2ad109bb56543d15842f3c31c3d5c8837a88cbeec8814e,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,0.03492140769958496,0.046927690505981445,0.04199361801147461,0.01401376724243164,0.039571523666381836,0.042749881744384766,0.04192304611206055,0.21908855438232422,0.16547894477844238,1.8683269023895264,0.5518810749053955,0.06352710723876953,0.0545806884765625,0.06256890296936035,0.05633902549743652,0.06111645698547363 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,False,True,3,8,44,6,True,6,Tests_passed,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,True,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,True,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,5703d69f10c3c746bc60870267019fff3aa3f5bc75d6079d5dc7b357afd49e71,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,Merge_failed,83c3c248686a0113fc22e01267add7cded101ecd27e72719dea5519d5e3e08a3,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,ec5bd224e3169d2a8ae6bb2087dc7ae0f74f6e968c2118a35ec30166f676a27f,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,3ab3dfd7063a1144fe20771fb8718c939c930cbfa708a92c5e774efd62d3a052,Merge_failed,9020cf934efe255b1778eca184963dc64ed7da1c4d49120c5e019f078516863f,Merge_failed,9c1abd916b2afc31150d0065a4f5e39dd989be8ac56244dd6bd836ee8b08df9b,Tests_failed,2311a3f4da38b68dba2ad109bb56543d15842f3c31c3d5c8837a88cbeec8814e,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,0.03492140769958496,0.046927690505981445,0.04199361801147461,0.01401376724243164,0.039571523666381836,0.042749881744384766,0.04192304611206055,0.21908855438232422,0.16547894477844238,1.8683269023895264,0.5518810749053955,0.06352710723876953,0.0545806884765625,0.06256890296936035,0.05633902549743652,0.06111645698547363,0.05506181716918945,0.06305885314941406,0.05353808403015137,0.06489181518554688,0.055745840072631836,0.06380724906921387,0.05403399467468262,0.11682271957397461,0.13384652137756348,2.2050623893737793,0.6928706169128418,0.06167197227478027,0.05601835250854492,0.06258130073547363,0.05463862419128418,0.06114077568054199 diff --git a/results/combined/merges_timed/wikimedia/search-highlighter.csv b/results/combined/merges_timed/wikimedia/search-highlighter.csv index a316a4467f..23e980785c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,True,7,17,142,3,True,7,Tests_passed,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,True,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,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,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,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,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,d40cf2e723771342dfcdf5f1595037eb1d53091e25a3b125dfc0a342c64deec3,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,0.01609182357788086,0.01607346534729004,0.019089221954345703,0.027719736099243164,0.019291400909423828,0.01913905143737793,0.018915176391601562,0.061125755310058594,0.12629008293151855,2.3730711936950684,0.545757532119751,0.03578305244445801,0.1023094654083252,0.05008578300476074,0.08481240272521973,0.09894299507141113 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,True,7,17,142,3,True,7,Tests_passed,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,True,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,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,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,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,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,d40cf2e723771342dfcdf5f1595037eb1d53091e25a3b125dfc0a342c64deec3,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,0.01609182357788086,0.01607346534729004,0.019089221954345703,0.027719736099243164,0.019291400909423828,0.01913905143737793,0.018915176391601562,0.061125755310058594,0.12629008293151855,2.3730711936950684,0.545757532119751,0.03578305244445801,0.1023094654083252,0.05008578300476074,0.08481240272521973,0.09894299507141113,0.1023406982421875,0.08830380439758301,0.1050715446472168,0.10385775566101074,0.0857400894165039,0.10590553283691406,0.10304784774780273,0.15102434158325195,0.16245460510253906,2.9202065467834473,0.6294975280761719,0.09755969047546387,0.10140252113342285,0.08335733413696289,0.0997474193572998,0.10418438911437988 diff --git a/results/combined/merges_timed/wildfirechat/server.csv b/results/combined/merges_timed/wildfirechat/server.csv index b046a6ea94..3c0d8965d4 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,True,False,True,2,2,4,2,True,2,Tests_passed,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,True,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.020304441452026367,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.11960005760192871,0.04873180389404297,0.7113966941833496,0.03742694854736328,0.07389044761657715,0.037122488021850586,0.07876253128051758,0.07767462730407715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,True,False,True,2,2,4,2,True,2,Tests_passed,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,True,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.020304441452026367,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.11960005760192871,0.04873180389404297,0.7113966941833496,0.03742694854736328,0.07389044761657715,0.037122488021850586,0.07876253128051758,0.07767462730407715,0.07460904121398926,0.07138442993164062,0.07521796226501465,0.07552886009216309,0.0755777359008789,0.07144570350646973,0.07265067100524902,0.10579204559326172,0.10642266273498535,0.08495354652404785,0.722991943359375,0.07266688346862793,0.07685613632202148,0.07146596908569336,0.07194399833679199,0.1127467155456543 diff --git a/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv b/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv index cfcb3fc03f..ce2fe7adf6 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,True,7,18,808,2,True,7,Tests_passed,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,True,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,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,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,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,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,0.007798433303833008,0.008360862731933594,0.008168935775756836,0.013961076736450195,0.008031845092773438,0.008181095123291016,0.008092880249023438,0.03044915199279785,0.0618433952331543,0.6983485221862793,0.26331567764282227,0.029174327850341797,0.05092215538024902,0.029553651809692383,0.051869869232177734,0.053604841232299805 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,True,7,18,808,2,True,7,Tests_passed,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,True,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,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,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,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,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,0.007798433303833008,0.008360862731933594,0.008168935775756836,0.013961076736450195,0.008031845092773438,0.008181095123291016,0.008092880249023438,0.03044915199279785,0.0618433952331543,0.6983485221862793,0.26331567764282227,0.029174327850341797,0.05092215538024902,0.029553651809692383,0.051869869232177734,0.053604841232299805,0.052556753158569336,0.052364349365234375,0.052661895751953125,0.05353355407714844,0.05356454849243164,0.05208778381347656,0.05229353904724121,0.08400964736938477,0.0839545726776123,0.8522195816040039,0.3058602809906006,0.0524296760559082,0.05263161659240723,0.052407026290893555,0.05168604850769043,0.052988529205322266 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 771a5139c5..58b6274516 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -448,refs/remotes/origin/pull/2282,b35723447a7acc01274ecf342d6e6c23a506b25f,5672e02762786c40cc2ac2a794d296ddcb8636bc,e1764efb4d2d997bc9939fa72a3fb06561c40403,,True,True,True,11,24,122.0,2,True,11,Tests_passed,c5745a129fddb0f2c287731913a096e4cc800b5e89c05bc1f2c289b37a9f9b3a,True,Tests_passed,04e3d8ac8e2ddade4ced7ae3b62dd3807b807e89448a3c4bf50d4c1616eb3158,True,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,9699335e25831c7f9ef034abfefd8c987fd4b4833785fde0e2aa3b080c242f79,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_timedout,,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,04c6bcbfe7ae5bd34fa2c187a7019a53b11e2d7a32dddbca64a403e02263d68f,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Tests_passed,5ec9c743b987057cdafe365190a259e692391a207fadc12246cf9ffcefadf8e4,Merge_timedout,,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,0.017594575881958008,0.017143964767456055,0.019128084182739258,0.03082728385925293,0.019375324249267578,0.01952219009399414,0.01936650276184082,0.13346433639526367,0.10713791847229004,1.796215534210205,-1.0,0.056826114654541016,0.057555198669433594,0.05844759941101074,0.05754590034484863,0.05655360221862793 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +448,refs/remotes/origin/pull/2282,b35723447a7acc01274ecf342d6e6c23a506b25f,5672e02762786c40cc2ac2a794d296ddcb8636bc,e1764efb4d2d997bc9939fa72a3fb06561c40403,,True,True,True,11,24,122.0,2,True,11,Tests_passed,c5745a129fddb0f2c287731913a096e4cc800b5e89c05bc1f2c289b37a9f9b3a,True,Tests_passed,04e3d8ac8e2ddade4ced7ae3b62dd3807b807e89448a3c4bf50d4c1616eb3158,True,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,9699335e25831c7f9ef034abfefd8c987fd4b4833785fde0e2aa3b080c242f79,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_timedout,,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,04c6bcbfe7ae5bd34fa2c187a7019a53b11e2d7a32dddbca64a403e02263d68f,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Tests_passed,5ec9c743b987057cdafe365190a259e692391a207fadc12246cf9ffcefadf8e4,Merge_timedout,,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,0.017594575881958008,0.017143964767456055,0.019128084182739258,0.03082728385925293,0.019375324249267578,0.01952219009399414,0.01936650276184082,0.13346433639526367,0.10713791847229004,1.796215534210205,-1.0,0.056826114654541016,0.057555198669433594,0.05844759941101074,0.05754590034484863,0.05655360221862793,0.05453658103942871,0.053739309310913086,0.054251909255981445,0.05656838417053223,0.05465817451477051,0.055069923400878906,0.05644106864929199,0.09688162803649902,0.0965280532836914,1.0972487926483154,-1.0,0.05541110038757324,0.054779052734375,0.05561470985412598,0.05327415466308594,0.0540924072265625 diff --git a/results/combined/merges_timed/wizzercn/nutzwk.csv b/results/combined/merges_timed/wizzercn/nutzwk.csv index 5eae08a80f..00c825271a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,True,92,249,4046.0,2,True,92,Tests_passed,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,True,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,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,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,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,ac354a2b49bca2edb89de565a8de40a6372ba168682d38a5740787a6d7366c46,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.03511643409729004,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.12298583984375,0.5718934535980225,0.9765884876251221,0.05899190902709961,0.08531308174133301,0.059941768646240234,0.08222818374633789,0.08181524276733398 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,True,92,249,4046.0,2,True,92,Tests_passed,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,True,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,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,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,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,ac354a2b49bca2edb89de565a8de40a6372ba168682d38a5740787a6d7366c46,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.03511643409729004,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.12298583984375,0.5718934535980225,0.9765884876251221,0.05899190902709961,0.08531308174133301,0.059941768646240234,0.08222818374633789,0.08181524276733398,0.07773351669311523,0.08043599128723145,0.08662676811218262,0.08554291725158691,0.0860908031463623,0.08425140380859375,0.08473801612854004,0.12098097801208496,0.11542439460754395,0.5996649265289307,0.9634931087493896,0.08205151557922363,0.07594490051269531,0.0796194076538086,0.08017349243164062,0.08209013938903809 diff --git a/results/combined/merges_timed/wkennedy/swagger4spring-web.csv b/results/combined/merges_timed/wkennedy/swagger4spring-web.csv index fe47db48d4..13da39eb3e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,True,True,True,10,46,377,2,True,10,Tests_passed,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,True,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,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,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,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,2898d457d5cde1b812b8fa098a8bb010b58f5febc6db6eaac73c2ddd4687d2c2,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,0.00908041000366211,0.009594202041625977,0.008964776992797852,0.01602482795715332,0.009104490280151367,0.009166240692138672,0.009153127670288086,0.032154083251953125,0.06394362449645996,0.7360045909881592,0.5428726673126221,0.030820846557617188,0.05582451820373535,0.03076958656311035,0.0554041862487793,0.0550534725189209 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,True,True,True,10,46,377,2,True,10,Tests_passed,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,True,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,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,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,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,2898d457d5cde1b812b8fa098a8bb010b58f5febc6db6eaac73c2ddd4687d2c2,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,0.00908041000366211,0.009594202041625977,0.008964776992797852,0.01602482795715332,0.009104490280151367,0.009166240692138672,0.009153127670288086,0.032154083251953125,0.06394362449645996,0.7360045909881592,0.5428726673126221,0.030820846557617188,0.05582451820373535,0.03076958656311035,0.0554041862487793,0.0550534725189209,0.05111503601074219,0.051038503646850586,0.05274248123168945,0.05132699012756348,0.05173659324645996,0.053174495697021484,0.05230450630187988,0.08452129364013672,0.08382010459899902,0.8408694267272949,0.5683367252349854,0.05373430252075195,0.05378890037536621,0.052623748779296875,0.05217099189758301,0.05296134948730469 diff --git a/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv b/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv index b09b10ca0d..569f015136 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,True,True,Tests_passed,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,True,6,69,379,2,True,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,True,6,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,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,a59760351a2e93239d35be10359ca97a427c22cef93a555bff946f9577416436,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,f957b273550fba7fb44d7952faf9c017f44fe3b51a3e7dc3b3358423bd36a291,Tests_failed,b8a3e1c708323731267cfa1d4b91b40bbdeb556f6fc144cc1fdd55f74b21827e,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,0.008591175079345703,0.009990453720092773,0.008712530136108398,0.012763023376464844,0.008918523788452148,0.009684085845947266,0.010998249053955078,0.04060077667236328,0.08302164077758789,1.4124438762664795,0.39698290824890137,0.03901863098144531,0.03986859321594238,0.03978109359741211,0.043886423110961914,0.04153132438659668 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,True,True,Tests_passed,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,True,6,69,379,2,True,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,True,6,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,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,a59760351a2e93239d35be10359ca97a427c22cef93a555bff946f9577416436,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,f957b273550fba7fb44d7952faf9c017f44fe3b51a3e7dc3b3358423bd36a291,Tests_failed,b8a3e1c708323731267cfa1d4b91b40bbdeb556f6fc144cc1fdd55f74b21827e,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,0.008591175079345703,0.009990453720092773,0.008712530136108398,0.012763023376464844,0.008918523788452148,0.009684085845947266,0.010998249053955078,0.04060077667236328,0.08302164077758789,1.4124438762664795,0.39698290824890137,0.03901863098144531,0.03986859321594238,0.03978109359741211,0.043886423110961914,0.04153132438659668,0.04418826103210449,0.04023122787475586,0.04331326484680176,0.039435386657714844,0.042428016662597656,0.042037248611450195,0.04221963882446289,0.07312321662902832,0.07487201690673828,1.1234915256500244,0.4578843116760254,0.04180479049682617,0.0437161922454834,0.04310941696166992,0.0417332649230957,0.039780616760253906 diff --git a/results/combined/merges_timed/wnbittle/dyn4j.csv b/results/combined/merges_timed/wnbittle/dyn4j.csv index 282050c613..646b56a492 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,True,247,1282,34297.0,37,True,250,Tests_passed,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,True,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,True,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,75f5aa7d8a5c5de16491c4af76409d532705d73f0d1376932a2b4a7ea83e830c,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,Merge_failed,514b450a2e94938b53dbe1400d496d5b9a7c22268c96a8a8ac2556485fe85988,Merge_failed,4ff03fc4d831a7f4a2927c92bfeb4043d477cdf6b1d0cfb64d8f0b6a9cc9817c,Merge_failed,a463f4f586bb3808e8af807b0dda3451b2d024ec7963ce371a8e1cda2432328c,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,Merge_failed,bc5eed28e95905635763b4aced11e0f9821c85fbd1a59990484e20a67f344054,Merge_failed,b3e1eafdc2a1f8c525c2746bacf1439419b96be5fde78d08b4124f5b26587659,Merge_failed,2ab1db160025326c9224c9e2bc61931a54dd758d7f979d22dd67b1952a3f1f68,Merge_failed,2ab1db160025326c9224c9e2bc61931a54dd758d7f979d22dd67b1952a3f1f68,Merge_failed,bc5eed28e95905635763b4aced11e0f9821c85fbd1a59990484e20a67f344054,Merge_failed,1dc81b3e5b92df2bfa3b6891e5c716fd5c621c75dcac598662543b37f1f8b7ab,Merge_failed,c5a3a749d5100f31e10113f61cffc1317677e75fddbf42a5b09101b96280ab7a,Merge_failed,158109aed5547e6c315be341ae2d916950f1118be7166584b92a219530ecbe71,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,0.06372952461242676,0.0687704086303711,0.06677627563476562,0.06233930587768555,0.08351397514343262,0.07204246520996094,0.07474231719970703,2.592613458633423,2.2393059730529785,32.43512988090515,89.31699466705322,0.2752373218536377,0.6663858890533447,0.3482534885406494,0.8827781677246094,0.84731125831604 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,True,247,1282,34297.0,37,True,250,Tests_passed,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,True,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,True,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,75f5aa7d8a5c5de16491c4af76409d532705d73f0d1376932a2b4a7ea83e830c,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,Merge_failed,514b450a2e94938b53dbe1400d496d5b9a7c22268c96a8a8ac2556485fe85988,Merge_failed,4ff03fc4d831a7f4a2927c92bfeb4043d477cdf6b1d0cfb64d8f0b6a9cc9817c,Merge_failed,a463f4f586bb3808e8af807b0dda3451b2d024ec7963ce371a8e1cda2432328c,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,Merge_failed,bc5eed28e95905635763b4aced11e0f9821c85fbd1a59990484e20a67f344054,Merge_failed,b3e1eafdc2a1f8c525c2746bacf1439419b96be5fde78d08b4124f5b26587659,Merge_failed,2ab1db160025326c9224c9e2bc61931a54dd758d7f979d22dd67b1952a3f1f68,Merge_failed,2ab1db160025326c9224c9e2bc61931a54dd758d7f979d22dd67b1952a3f1f68,Merge_failed,bc5eed28e95905635763b4aced11e0f9821c85fbd1a59990484e20a67f344054,Merge_failed,1dc81b3e5b92df2bfa3b6891e5c716fd5c621c75dcac598662543b37f1f8b7ab,Merge_failed,c5a3a749d5100f31e10113f61cffc1317677e75fddbf42a5b09101b96280ab7a,Merge_failed,158109aed5547e6c315be341ae2d916950f1118be7166584b92a219530ecbe71,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,49167a5fcbfe7dcd86abe2c949b6c347e6f80ffccdc1a1e57cbc571711d81b87,Merge_failed,7836072483d90583b702da1b48261a638c8c7595935b32c38e465e2c9ee3eac1,0.06372952461242676,0.0687704086303711,0.06677627563476562,0.06233930587768555,0.08351397514343262,0.07204246520996094,0.07474231719970703,2.592613458633423,2.2393059730529785,32.43512988090515,89.31699466705322,0.2752373218536377,0.6663858890533447,0.3482534885406494,0.8827781677246094,0.84731125831604,0.8232376575469971,0.807591438293457,0.8132297992706299,0.798201322555542,0.7954535484313965,0.7988905906677246,0.8035025596618652,1.4593122005462646,1.8126699924468994,33.54651141166687,91.83541965484619,0.8149721622467041,0.7925856113433838,0.798292875289917,0.7935009002685547,0.8041112422943115 diff --git a/results/combined/merges_timed/wocommunity/wonder.csv b/results/combined/merges_timed/wocommunity/wonder.csv index 46ec4e2e1e..680e7a0302 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,False,True,2,3,8.0,2,True,2,Tests_passed,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,True,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,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,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,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,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e4700071543d18760eb8f797125575072f4af9597ff546259889a5b7e8ac0be4,Tests_failed,c5cd7c535c8fed17c050f374e231415ff094ef50492c9cc274f85eecfdf517bc,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,0.08449554443359375,0.057265520095825195,0.106231689453125,0.0685281753540039,0.09912562370300293,0.0887749195098877,0.1087484359741211,0.17799019813537598,0.1332697868347168,2.442981243133545,0.833698034286499,0.11231374740600586,0.16058802604675293,0.11396312713623047,0.1640644073486328,0.15291786193847656 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,False,True,2,3,8.0,2,True,2,Tests_passed,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,True,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,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,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,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,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e4700071543d18760eb8f797125575072f4af9597ff546259889a5b7e8ac0be4,Tests_failed,c5cd7c535c8fed17c050f374e231415ff094ef50492c9cc274f85eecfdf517bc,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,0.08449554443359375,0.057265520095825195,0.106231689453125,0.0685281753540039,0.09912562370300293,0.0887749195098877,0.1087484359741211,0.17799019813537598,0.1332697868347168,2.442981243133545,0.833698034286499,0.11231374740600586,0.16058802604675293,0.11396312713623047,0.1640644073486328,0.15291786193847656,0.14765167236328125,0.140150785446167,0.16180014610290527,0.1573939323425293,0.16267108917236328,0.16097211837768555,0.16155791282653809,0.24158525466918945,0.18440914154052734,2.507784605026245,0.809084415435791,0.14661288261413574,0.1440436840057373,0.14966535568237305,0.14510655403137207,0.1432962417602539 diff --git a/results/combined/merges_timed/woder/torchbot.csv b/results/combined/merges_timed/woder/torchbot.csv index 6b5b1d6381..39aacbc585 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,True,,Tests_passed,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,True,10,22,,2,True,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,True,10,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,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Tests_passed,43c4e4729ad9b9d5f48c01316ac2f636189bd79717b7b0b7546057a97dd5a1fc,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,9e6e6d504bbf7200c7653626469e38042b9598058c792a64b97fa60daf8b7365,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,0.029256820678710938,0.026271343231201172,0.061632633209228516,0.04056143760681152,0.04181480407714844,0.04488801956176758,0.01919245719909668,0.17643308639526367,0.1066596508026123,0.03395223617553711,0.5281000137329102,0.1028287410736084,0.07383346557617188,0.0760185718536377,0.07066893577575684,0.0711374282836914 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,True,,Tests_passed,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,True,10,22,,2,True,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,True,10,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,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Tests_passed,43c4e4729ad9b9d5f48c01316ac2f636189bd79717b7b0b7546057a97dd5a1fc,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,9e6e6d504bbf7200c7653626469e38042b9598058c792a64b97fa60daf8b7365,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,0.029256820678710938,0.026271343231201172,0.061632633209228516,0.04056143760681152,0.04181480407714844,0.04488801956176758,0.01919245719909668,0.17643308639526367,0.1066596508026123,0.03395223617553711,0.5281000137329102,0.1028287410736084,0.07383346557617188,0.0760185718536377,0.07066893577575684,0.0711374282836914,0.06970977783203125,0.06877326965332031,0.07641339302062988,0.07183647155761719,0.0747063159942627,0.07065057754516602,0.07367134094238281,0.11278080940246582,0.11352825164794922,0.0936269760131836,0.6724398136138916,0.06906533241271973,0.07050251960754395,0.06971359252929688,0.07254958152770996,0.0677032470703125 diff --git a/results/combined/merges_timed/wokier/teh.csv b/results/combined/merges_timed/wokier/teh.csv index c4e9fc40dc..07a490ea5c 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,True,6,36,194,2,True,6,Tests_passed,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,True,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,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,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,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,07b1532692646d2b9854d6a6bbf3ddb8527d6e6c7467532cc966903c68ee7d1d,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,0.044860124588012695,0.04207134246826172,0.009540319442749023,0.03179121017456055,0.025434494018554688,0.03693413734436035,0.04274296760559082,0.16337895393371582,0.11221647262573242,0.5293869972229004,0.30550408363342285,0.05496931076049805,0.05694150924682617,0.05503129959106445,0.07489228248596191,0.08204388618469238 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,True,6,36,194,2,True,6,Tests_passed,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,True,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,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,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,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,07b1532692646d2b9854d6a6bbf3ddb8527d6e6c7467532cc966903c68ee7d1d,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,0.044860124588012695,0.04207134246826172,0.009540319442749023,0.03179121017456055,0.025434494018554688,0.03693413734436035,0.04274296760559082,0.16337895393371582,0.11221647262573242,0.5293869972229004,0.30550408363342285,0.05496931076049805,0.05694150924682617,0.05503129959106445,0.07489228248596191,0.08204388618469238,0.07331967353820801,0.06398725509643555,0.07781195640563965,0.08149337768554688,0.0762791633605957,0.07182598114013672,0.07942676544189453,0.11641883850097656,0.10806107521057129,0.5380370616912842,0.3513665199279785,0.07324719429016113,0.0684516429901123,0.0760958194732666,0.07428216934204102,0.052655935287475586 diff --git a/results/combined/merges_timed/wordnik/swagger-codegen.csv b/results/combined/merges_timed/wordnik/swagger-codegen.csv index 251f449d9c..1e66e0cd41 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -4005,refs/remotes/origin/pull/2059,71c496e2102ef301d1febb77fd6986e5cb70e0b6,9e50dfe4db8c08b714b26286d7ffb1afd7533fdb,248be5e75aac40c8b412b222bbb546021e1c2ab3,,True,True,True,29,101,1076.0,16,True,30,Tests_passed,c86093eedc0a66d040746fabeb3eaba3a86faa959707e5fb744596748b101d32,True,Tests_passed,0014cd8c033f647ca436b045e6b9d49538cc89489ab3f5046cf5453951aeb976,True,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,4339c6de10bbc5268a35268fad2bd8a9ffcd7d2e70e9b427d67926c2411e4722,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,09518d85fd78fc02201c498acb28574b34eb691c72de2f176e669cb6af401263,Merge_failed,c86b1c44344f4414ad81d9f6fde1afffd5909361a1084fa3b483630670eb36e2,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,024c09f819434b487a89b4b44857951447a9a2c383971f40c3a61988edf99ff1,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,39c070cfb99752e17fa6bde519fc35d81984a22f80eb3cb7d0d172aad341cc35,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,0.06907415390014648,0.06562185287475586,0.0764780044555664,0.02747035026550293,0.07636642456054688,0.06364774703979492,0.07616043090820312,1.171959638595581,0.8724992275238037,4.947203874588013,0.5238676071166992,0.10865092277526855,0.10859203338623047,0.10782170295715332,0.10568571090698242,0.10497593879699707 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +4005,refs/remotes/origin/pull/2059,71c496e2102ef301d1febb77fd6986e5cb70e0b6,9e50dfe4db8c08b714b26286d7ffb1afd7533fdb,248be5e75aac40c8b412b222bbb546021e1c2ab3,,True,True,True,29,101,1076.0,16,True,30,Tests_passed,c86093eedc0a66d040746fabeb3eaba3a86faa959707e5fb744596748b101d32,True,Tests_passed,0014cd8c033f647ca436b045e6b9d49538cc89489ab3f5046cf5453951aeb976,True,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,4339c6de10bbc5268a35268fad2bd8a9ffcd7d2e70e9b427d67926c2411e4722,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,09518d85fd78fc02201c498acb28574b34eb691c72de2f176e669cb6af401263,Merge_failed,c86b1c44344f4414ad81d9f6fde1afffd5909361a1084fa3b483630670eb36e2,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,024c09f819434b487a89b4b44857951447a9a2c383971f40c3a61988edf99ff1,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,39c070cfb99752e17fa6bde519fc35d81984a22f80eb3cb7d0d172aad341cc35,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,0.06907415390014648,0.06562185287475586,0.0764780044555664,0.02747035026550293,0.07636642456054688,0.06364774703979492,0.07616043090820312,1.171959638595581,0.8724992275238037,4.947203874588013,0.5238676071166992,0.10865092277526855,0.10859203338623047,0.10782170295715332,0.10568571090698242,0.10497593879699707,0.10361242294311523,0.10117411613464355,0.10466742515563965,0.10443234443664551,0.10342621803283691,0.10216856002807617,0.10200262069702148,0.36232542991638184,0.46166038513183594,5.054739236831665,0.6220846176147461,0.10281515121459961,0.10316014289855957,0.10240054130554199,0.10191988945007324,0.1041715145111084 diff --git a/results/combined/merges_timed/wsky/top-push.csv b/results/combined/merges_timed/wsky/top-push.csv index b64ec0c918..2f4f482d8e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,True,True,True,8,30,165,3,True,8,Tests_passed,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,True,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,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,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Tests_passed,fa245b0623251d0f8e5ef8cb95295088e3e0e4b0aa629d7fcf95e128016896b1,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,5b7d5654e177d407652e717a7195fffd4227a9b3d9bf226430dc6e799af47e3c,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,930db54177c28463383d8fe1034038bd7f6140fb5bb1121e22ffada2f3b0231a,Tests_passed,9f9c34579b2afa82bc308c8fd416ea30d61fce628d2d8b9cf47b4e1c5ad575b1,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,0.011473655700683594,0.01157999038696289,0.012828588485717773,0.01905679702758789,0.012850761413574219,0.012777328491210938,0.012888908386230469,0.05435991287231445,0.12476992607116699,1.0732040405273438,0.40987682342529297,0.058071136474609375,0.06870436668395996,0.047629356384277344,0.06921267509460449,0.06871676445007324 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,True,True,True,8,30,165,3,True,8,Tests_passed,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,True,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,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,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Tests_passed,fa245b0623251d0f8e5ef8cb95295088e3e0e4b0aa629d7fcf95e128016896b1,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,5b7d5654e177d407652e717a7195fffd4227a9b3d9bf226430dc6e799af47e3c,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,930db54177c28463383d8fe1034038bd7f6140fb5bb1121e22ffada2f3b0231a,Tests_passed,9f9c34579b2afa82bc308c8fd416ea30d61fce628d2d8b9cf47b4e1c5ad575b1,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,0.011473655700683594,0.01157999038696289,0.012828588485717773,0.01905679702758789,0.012850761413574219,0.012777328491210938,0.012888908386230469,0.05435991287231445,0.12476992607116699,1.0732040405273438,0.40987682342529297,0.058071136474609375,0.06870436668395996,0.047629356384277344,0.06921267509460449,0.06871676445007324,0.06555819511413574,0.058511972427368164,0.06618523597717285,0.05874800682067871,0.06722426414489746,0.06674766540527344,0.06591463088989258,0.1157984733581543,0.1374070644378662,1.200814962387085,0.490872859954834,0.06632542610168457,0.06708240509033203,0.0654287338256836,0.06652331352233887,0.0660707950592041 diff --git a/results/combined/merges_timed/wstrange/googleauth.csv b/results/combined/merges_timed/wstrange/googleauth.csv index c2df5c49bb..3ca4cbe87b 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,True,9,51,576,4,True,9,Tests_passed,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,True,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,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,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,Merge_failed,4ea8ecc3ca1a646053be364587e2e0faa0d7f4bfa0b1a50fee519c909f0ca4d5,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,f83e1a1295e27ae1a4640778c73530f72c9329678efbd5174301ecbf94c42a16,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,bee5d76105d57ef10ceb6da645db3ebb6d8c1af7427f53513c11da74ef00357d,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,0.04676532745361328,0.04135274887084961,0.04450058937072754,0.01578044891357422,0.04786276817321777,0.029761791229248047,0.04519939422607422,0.3025088310241699,0.24462652206420898,1.4528205394744873,0.48685479164123535,0.054961204528808594,0.07383060455322266,0.055231332778930664,0.08011126518249512,0.07605910301208496 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,True,9,51,576,4,True,9,Tests_passed,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,True,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,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,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,Merge_failed,4ea8ecc3ca1a646053be364587e2e0faa0d7f4bfa0b1a50fee519c909f0ca4d5,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,f83e1a1295e27ae1a4640778c73530f72c9329678efbd5174301ecbf94c42a16,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,bee5d76105d57ef10ceb6da645db3ebb6d8c1af7427f53513c11da74ef00357d,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,0.04676532745361328,0.04135274887084961,0.04450058937072754,0.01578044891357422,0.04786276817321777,0.029761791229248047,0.04519939422607422,0.3025088310241699,0.24462652206420898,1.4528205394744873,0.48685479164123535,0.054961204528808594,0.07383060455322266,0.055231332778930664,0.08011126518249512,0.07605910301208496,0.07706117630004883,0.07344746589660645,0.07478523254394531,0.07313108444213867,0.07366275787353516,0.07403683662414551,0.07370734214782715,0.13604354858398438,0.16116547584533691,1.4980676174163818,0.5658934116363525,0.07721543312072754,0.07678055763244629,0.078704833984375,0.07668042182922363,0.07333588600158691 diff --git a/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv b/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv index 3550a86490..4b3b4a4428 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -134,refs/remotes/origin/pull/76,14a73cb57b51b49248c3f76c52d97c311dd7a4c2,10e134245825a25842e170ec12c08c99b86b261c,566f6b3a1cf6c52c902e9c2f1b8fdce0281f72c1,,True,True,Tests_passed,63c8c47e67f9341d3e086d4023201ce8803c54d0bef75d8a5d62c191f157cbc7,True,10,61,417,2,True,Tests_passed,38ba3b34cc141cead979862489112bc5bca6c07176d8260aead8883ab5ea3e46,True,10,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,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Tests_failed,0196e41d548edf4dea7a0b1396f358cf7d01cf85a791445f6fe4e38c4f1b2147,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ceae795c6a75f18ef30505efe5cc6c08809b63124a3bda2e8d04aaeb5196f63c,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Tests_failed,2d0fe6582a3881c18da437cfc3fc9f8ccf06502bbbe008c540436f2457e607b7,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,0.047963619232177734,0.04803180694580078,0.043988704681396484,0.015154123306274414,0.046434640884399414,0.04266834259033203,0.03987264633178711,0.17411375045776367,0.11956381797790527,1.511155128479004,0.5130455493927002,0.04248857498168945,0.044043540954589844,0.04519510269165039,0.0471644401550293,0.044028520584106445 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +134,refs/remotes/origin/pull/76,14a73cb57b51b49248c3f76c52d97c311dd7a4c2,10e134245825a25842e170ec12c08c99b86b261c,566f6b3a1cf6c52c902e9c2f1b8fdce0281f72c1,,True,True,Tests_passed,63c8c47e67f9341d3e086d4023201ce8803c54d0bef75d8a5d62c191f157cbc7,True,10,61,417,2,True,Tests_passed,38ba3b34cc141cead979862489112bc5bca6c07176d8260aead8883ab5ea3e46,True,10,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,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Tests_failed,0196e41d548edf4dea7a0b1396f358cf7d01cf85a791445f6fe4e38c4f1b2147,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ceae795c6a75f18ef30505efe5cc6c08809b63124a3bda2e8d04aaeb5196f63c,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Tests_failed,2d0fe6582a3881c18da437cfc3fc9f8ccf06502bbbe008c540436f2457e607b7,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,0.047963619232177734,0.04803180694580078,0.043988704681396484,0.015154123306274414,0.046434640884399414,0.04266834259033203,0.03987264633178711,0.17411375045776367,0.11956381797790527,1.511155128479004,0.5130455493927002,0.04248857498168945,0.044043540954589844,0.04519510269165039,0.0471644401550293,0.044028520584106445,0.048415422439575195,0.04185223579406738,0.04692339897155762,0.0411984920501709,0.04819083213806152,0.04662060737609863,0.04636216163635254,0.07696151733398438,0.08179259300231934,1.509608507156372,0.5921754837036133,0.04945087432861328,0.046636343002319336,0.04697155952453613,0.04683518409729004,0.042070627212524414 diff --git a/results/combined/merges_timed/wwadge/hbnpojogen.csv b/results/combined/merges_timed/wwadge/hbnpojogen.csv index 43e77e5eaa..2fdc7663be 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,True,11,22,136,2,True,11,Tests_passed,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,True,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,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,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Merge_timedout,,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,9cda5d095b78b3547a9683fd5ad0e8e7c9fffc1a6508c04e2f91bd69cdfd4220,Merge_timedout,,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,0.05835318565368652,0.053958892822265625,0.05819058418273926,0.03141379356384277,0.053214073181152344,0.03547549247741699,0.03730201721191406,0.18923687934875488,0.08883547782897949,2.1661458015441895,-1.0,0.05354142189025879,0.08431005477905273,0.05203437805175781,0.08931112289428711,0.08046507835388184 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,True,11,22,136,2,True,11,Tests_passed,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,True,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,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,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Merge_timedout,,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,9cda5d095b78b3547a9683fd5ad0e8e7c9fffc1a6508c04e2f91bd69cdfd4220,Merge_timedout,,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,f9d7426670009db014add83af4b8088e0329e9845884b7c44010afd1c0577567,Tests_passed,a6a489edd5636ef3f540206b424a5cdd3dbcf9ff3721b272bf3e069eb023a330,0.05835318565368652,0.053958892822265625,0.05819058418273926,0.03141379356384277,0.053214073181152344,0.03547549247741699,0.03730201721191406,0.18923687934875488,0.08883547782897949,2.1661458015441895,-1.0,0.05354142189025879,0.08431005477905273,0.05203437805175781,0.08931112289428711,0.08046507835388184,0.08569741249084473,0.08603978157043457,0.08772945404052734,0.08544635772705078,0.08939218521118164,0.0793607234954834,0.08948731422424316,0.10885167121887207,0.11717939376831055,2.1266462802886963,-1.0,0.07611417770385742,0.08089375495910645,0.06979870796203613,0.08085513114929199,0.07117438316345215 diff --git a/results/combined/merges_timed/xaverw/msearch.csv b/results/combined/merges_timed/xaverw/msearch.csv index a6fcea3ea2..21a51d13a3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,True,True,True,3,18,67.0,2,True,3,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,True,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,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,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,Merge_failed,f0763035f247778a1c8b37922eeb72e5ee0b01d342a6a8772dea9a8f5ff2664d,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,5180059e90c3924773da706d44aba1fada8ebd5028117ce1dd4725af156be647,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Tests_failed,de6bd4152769cbfd400b3dd4ac4637f8226092c2c03e1aec00f276495afd90a5,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,0.03905344009399414,0.04337596893310547,0.035262107849121094,0.016556501388549805,0.045031070709228516,0.04102492332458496,0.03164958953857422,0.18196439743041992,0.12399411201477051,1.1821303367614746,0.4678459167480469,0.045760154724121094,0.044687747955322266,0.04255867004394531,0.04443097114562988,0.0447084903717041 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,True,True,True,3,18,67.0,2,True,3,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,True,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,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,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,Merge_failed,f0763035f247778a1c8b37922eeb72e5ee0b01d342a6a8772dea9a8f5ff2664d,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,5180059e90c3924773da706d44aba1fada8ebd5028117ce1dd4725af156be647,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Tests_failed,de6bd4152769cbfd400b3dd4ac4637f8226092c2c03e1aec00f276495afd90a5,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,0.03905344009399414,0.04337596893310547,0.035262107849121094,0.016556501388549805,0.045031070709228516,0.04102492332458496,0.03164958953857422,0.18196439743041992,0.12399411201477051,1.1821303367614746,0.4678459167480469,0.045760154724121094,0.044687747955322266,0.04255867004394531,0.04443097114562988,0.0447084903717041,0.04666423797607422,0.04578828811645508,0.04616594314575195,0.04763174057006836,0.047156572341918945,0.04738283157348633,0.04673361778259277,0.07962369918823242,0.0911264419555664,1.336965799331665,0.551098108291626,0.04396653175354004,0.0462489128112793,0.04487204551696777,0.04672098159790039,0.04648470878601074 diff --git a/results/combined/merges_timed/xceptance/xcmailr.csv b/results/combined/merges_timed/xceptance/xcmailr.csv index 970d2070ef..a5cbd67d84 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,True,True,True,22,65,597,6,True,24,Tests_passed,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,True,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,True,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,aed7a1d9ca44ad3c06853689b0351782dfecb60680ff99fa34defaa077bc7da9,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,8251b6e2fab64289b6c1c708bd32bfd363ec6bf09bf23e276db383df24627e07,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,6c77a259333b51dad0840796fba31dea41efa233647bde72e8b4a9e13520c866,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,0.06205415725708008,0.06223344802856445,0.07507705688476562,0.09071040153503418,0.04774165153503418,0.07446432113647461,0.07465314865112305,0.16774606704711914,0.21636247634887695,1.067270278930664,0.5284194946289062,0.05491781234741211,0.09049630165100098,0.04485821723937988,0.09176301956176758,0.09107208251953125 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,True,True,True,22,65,597,6,True,24,Tests_passed,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,True,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,True,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,aed7a1d9ca44ad3c06853689b0351782dfecb60680ff99fa34defaa077bc7da9,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,8251b6e2fab64289b6c1c708bd32bfd363ec6bf09bf23e276db383df24627e07,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,6c77a259333b51dad0840796fba31dea41efa233647bde72e8b4a9e13520c866,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,0.06205415725708008,0.06223344802856445,0.07507705688476562,0.09071040153503418,0.04774165153503418,0.07446432113647461,0.07465314865112305,0.16774606704711914,0.21636247634887695,1.067270278930664,0.5284194946289062,0.05491781234741211,0.09049630165100098,0.04485821723937988,0.09176301956176758,0.09107208251953125,0.16046619415283203,0.0844573974609375,0.08467507362365723,0.08772706985473633,0.08474469184875488,0.08559465408325195,0.0865178108215332,0.15363407135009766,0.187103271484375,1.234133243560791,0.6526188850402832,0.08851337432861328,0.08640217781066895,0.0852363109588623,0.08548259735107422,0.08570408821105957 diff --git a/results/combined/merges_timed/xebia/xebium.csv b/results/combined/merges_timed/xebia/xebium.csv index 93e8c9507b..3cbf1fc856 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,True,17,26,1083.0,2,True,17,Tests_passed,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,True,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,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,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,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,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,8e08566375b8b515cfb2a338ca0b553fabe71bbb1888a64c00fe133b83c03882,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,0.05892348289489746,0.04136180877685547,0.04996514320373535,0.01897120475769043,0.0494232177734375,0.04474925994873047,0.044936418533325195,0.17433571815490723,0.07441997528076172,1.0687639713287354,0.3715245723724365,0.04066133499145508,0.06725764274597168,0.03986763954162598,0.06417036056518555,0.06516861915588379 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,True,17,26,1083.0,2,True,17,Tests_passed,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,True,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,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,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,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,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,8e08566375b8b515cfb2a338ca0b553fabe71bbb1888a64c00fe133b83c03882,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,0.05892348289489746,0.04136180877685547,0.04996514320373535,0.01897120475769043,0.0494232177734375,0.04474925994873047,0.044936418533325195,0.17433571815490723,0.07441997528076172,1.0687639713287354,0.3715245723724365,0.04066133499145508,0.06725764274597168,0.03986763954162598,0.06417036056518555,0.06516861915588379,0.06288409233093262,0.06340360641479492,0.0670320987701416,0.06743001937866211,0.061609506607055664,0.0652005672454834,0.06449460983276367,0.10023856163024902,0.0905451774597168,1.076362133026123,0.40424108505249023,0.06487250328063965,0.05867505073547363,0.06593871116638184,0.06567764282226562,0.0629274845123291 diff --git a/results/combined/merges_timed/xerial/sqlite-jdbc.csv b/results/combined/merges_timed/xerial/sqlite-jdbc.csv index 3dcb8ae0bc..a1c581f707 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,False,True,3,9,46.0,2,True,3,Tests_passed,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,True,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,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,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_failed,058a9963bb1368770bebb81a86cee131e7178a965b53a305f2486e302e94d394,Tests_failed,dc5b7008f4428974928a8841958dbcdca2ee58619ba0e0a405e14db81efa9214,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,0.045928239822387695,0.04534125328063965,0.013927221298217773,0.17049717903137207,0.053664207458496094,0.054592132568359375,0.014462471008300781,0.1858205795288086,0.07611298561096191,2.214717388153076,0.6627154350280762,0.217085599899292,0.17441320419311523,0.12641000747680664,0.18533015251159668,0.16626214981079102 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,False,True,3,9,46.0,2,True,3,Tests_passed,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,True,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,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,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_failed,058a9963bb1368770bebb81a86cee131e7178a965b53a305f2486e302e94d394,Tests_failed,dc5b7008f4428974928a8841958dbcdca2ee58619ba0e0a405e14db81efa9214,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,Tests_passed,1fdf2d00126754fa78e6d5b65bb50771675bf5c96a56cbcb6185bf0403deb8a7,0.045928239822387695,0.04534125328063965,0.013927221298217773,0.17049717903137207,0.053664207458496094,0.054592132568359375,0.014462471008300781,0.1858205795288086,0.07611298561096191,2.214717388153076,0.6627154350280762,0.217085599899292,0.17441320419311523,0.12641000747680664,0.18533015251159668,0.16626214981079102,0.07424378395080566,0.12428808212280273,0.1254863739013672,0.152435302734375,0.1634073257446289,0.14983129501342773,0.15924453735351562,0.1884138584136963,0.16757917404174805,2.3126025199890137,0.7421951293945312,0.15479278564453125,0.14792442321777344,0.16418933868408203,0.13265442848205566,0.16615080833435059 diff --git a/results/combined/merges_timed/xuxueli/xxl-job.csv b/results/combined/merges_timed/xuxueli/xxl-job.csv index 9738e6d6db..d686186885 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,True,27.0,47,898.0,3,True,27,Tests_passed,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,True,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,ad2e3b11530a2edb74fac316cf33a347ca215fd9ade51399b20b86d2594c7b6a,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,4acdaf18c1975602adff75992d2ebac837ce83df8019a7ebd65565328a170a77,Tests_passed,b1cf7d47029b6f0ada7c0e3681c88c9a0f749e206ba7e2dfc0e4ae202ff77f5c,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_failed,c2e3553220dcffde7295a0b79864ec6de7d36567dc64d0242b28a0dd9d29616b,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.02300572395324707,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.17415165901184082,0.01564788818359375,0.6454758644104004,0.054842233657836914,0.06708502769470215,0.04598522186279297,0.0676572322845459,0.08528900146484375 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,True,27.0,47,898.0,3,True,27,Tests_passed,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,True,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,ad2e3b11530a2edb74fac316cf33a347ca215fd9ade51399b20b86d2594c7b6a,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,4acdaf18c1975602adff75992d2ebac837ce83df8019a7ebd65565328a170a77,Tests_passed,b1cf7d47029b6f0ada7c0e3681c88c9a0f749e206ba7e2dfc0e4ae202ff77f5c,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_failed,c2e3553220dcffde7295a0b79864ec6de7d36567dc64d0242b28a0dd9d29616b,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Merge_failed,e285c398a808637bf8a0d09ffa9abf583107216fbf2f716f210e632e2024f1cb,Tests_passed,d256b9791c016d76d0e0f18591cc99aa7333b162f55a02ef59ddacf21e3caeaf,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.02300572395324707,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.17415165901184082,0.01564788818359375,0.6454758644104004,0.054842233657836914,0.06708502769470215,0.04598522186279297,0.0676572322845459,0.08528900146484375,0.14498019218444824,0.08221268653869629,0.06520652770996094,0.0831308364868164,0.06488537788391113,0.06448245048522949,0.0668952465057373,0.11409687995910645,0.14132285118103027,0.08036208152770996,0.6937732696533203,0.0646200180053711,0.0660860538482666,0.06536984443664551,0.06549906730651855,0.07936382293701172 diff --git a/results/combined/merges_timed/yandex-qatools/ashot.csv b/results/combined/merges_timed/yandex-qatools/ashot.csv index 5179c6e1c7..068ce7cf55 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,True,6,12,51,5,True,8,Tests_passed,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,True,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,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,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,f3ab6e843227d98627c53c92f399b3d0bcbf98deaac07ea426dccf4d9911cf2b,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,9e0b352cf9518b5523421e25bc37a9f0e4c3299ce37b90f4e59d687baa5e5f1b,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,0.010593175888061523,0.010580301284790039,0.010961771011352539,0.0189208984375,0.011044740676879883,0.010965585708618164,0.010863304138183594,0.05048847198486328,0.12567710876464844,1.3154582977294922,0.4201514720916748,0.05821490287780762,0.05813455581665039,0.05694079399108887,0.05929303169250488,0.0587315559387207 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,True,6,12,51,5,True,8,Tests_passed,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,True,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,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,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,f3ab6e843227d98627c53c92f399b3d0bcbf98deaac07ea426dccf4d9911cf2b,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,9e0b352cf9518b5523421e25bc37a9f0e4c3299ce37b90f4e59d687baa5e5f1b,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,0.010593175888061523,0.010580301284790039,0.010961771011352539,0.0189208984375,0.011044740676879883,0.010965585708618164,0.010863304138183594,0.05048847198486328,0.12567710876464844,1.3154582977294922,0.4201514720916748,0.05821490287780762,0.05813455581665039,0.05694079399108887,0.05929303169250488,0.0587315559387207,0.057213783264160156,0.056813716888427734,0.05694913864135742,0.05802774429321289,0.05589580535888672,0.05709695816040039,0.0569310188293457,0.10346651077270508,0.1209409236907959,1.414945125579834,0.5003514289855957,0.05749702453613281,0.05607032775878906,0.05569958686828613,0.05565166473388672,0.057251930236816406 diff --git a/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv b/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv index 131d11f0c1..8794a1f67d 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,True,11,60,305,2,True,11,Tests_passed,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,True,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,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,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,5339914c2ffcbdb30d36621de7a696b18d5ad6b5b0559b6196445956086eadcb,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,f1e3d15f42aaafacd459c7d463f6083bc2b6703af87c2357b92826b75d3b23fa,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,300bb2161971c7010f37f239a606c25e1feccfbed1ae685f3165a584a72d7f97,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,0.009865522384643555,0.009993553161621094,0.009551763534545898,0.01553797721862793,0.009877920150756836,0.010052680969238281,0.009794950485229492,0.03475666046142578,0.06993818283081055,1.1524724960327148,0.6973512172698975,0.04327654838562012,0.04507589340209961,0.04143071174621582,0.044158935546875,0.045807600021362305 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,True,11,60,305,2,True,11,Tests_passed,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,True,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,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,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,5339914c2ffcbdb30d36621de7a696b18d5ad6b5b0559b6196445956086eadcb,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,f1e3d15f42aaafacd459c7d463f6083bc2b6703af87c2357b92826b75d3b23fa,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,300bb2161971c7010f37f239a606c25e1feccfbed1ae685f3165a584a72d7f97,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,0.009865522384643555,0.009993553161621094,0.009551763534545898,0.01553797721862793,0.009877920150756836,0.010052680969238281,0.009794950485229492,0.03475666046142578,0.06993818283081055,1.1524724960327148,0.6973512172698975,0.04327654838562012,0.04507589340209961,0.04143071174621582,0.044158935546875,0.045807600021362305,0.04322481155395508,0.04527783393859863,0.04508781433105469,0.045503854751586914,0.04463958740234375,0.04495501518249512,0.04537534713745117,0.07746458053588867,0.08530688285827637,1.3664116859436035,0.8127272129058838,0.04505729675292969,0.044965505599975586,0.04562687873840332,0.04423046112060547,0.04425787925720215 diff --git a/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv b/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv index 3e2e325766..c20e142cbe 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,True,False,Tests_passed,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,True,3,5,10,3,True,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,True,3,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,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,0.015785694122314453,0.04281473159790039,0.04190349578857422,0.014429092407226562,0.03847336769104004,0.04178738594055176,0.03984570503234863,0.23376226425170898,0.178663969039917,0.04440665245056152,0.2235267162322998,0.04100632667541504,0.0620579719543457,0.04933309555053711,0.07428145408630371,0.0743858814239502 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,True,False,Tests_passed,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,True,3,5,10,3,True,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,True,3,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,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,Tests_passed,41c56471ff7a0cd50bb67c9a10de811d775b3efd29da5ebf63bb5a27604f9299,0.015785694122314453,0.04281473159790039,0.04190349578857422,0.014429092407226562,0.03847336769104004,0.04178738594055176,0.03984570503234863,0.23376226425170898,0.178663969039917,0.04440665245056152,0.2235267162322998,0.04100632667541504,0.0620579719543457,0.04933309555053711,0.07428145408630371,0.0743858814239502,0.06952524185180664,0.0697782039642334,0.07015538215637207,0.07182002067565918,0.0694265365600586,0.07116079330444336,0.0702362060546875,0.11812996864318848,0.1305856704711914,0.08422183990478516,0.29060792922973633,0.07023906707763672,0.07121109962463379,0.06949567794799805,0.07144498825073242,0.06953811645507812 diff --git a/results/combined/merges_timed/yaphone/itchat4j.csv b/results/combined/merges_timed/yaphone/itchat4j.csv index 40c0979232..8652454a90 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,True,8,26,294,9,True,16,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,True,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,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,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,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,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.018824100494384766,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.1192479133605957,1.3738751411437988,0.6013927459716797,0.03288602828979492,0.06060194969177246,0.03295278549194336,0.06060981750488281,0.06193685531616211 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,True,8,26,294,9,True,16,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,True,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,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,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,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,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.018824100494384766,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.1192479133605957,1.3738751411437988,0.6013927459716797,0.03288602828979492,0.06060194969177246,0.03295278549194336,0.06060981750488281,0.06193685531616211,0.05801749229431152,0.06025409698486328,0.057749271392822266,0.06179356575012207,0.0589292049407959,0.05737447738647461,0.058197975158691406,0.09263801574707031,0.09162116050720215,1.379554033279419,0.6345565319061279,0.05756688117980957,0.05725812911987305,0.05723857879638672,0.0580902099609375,0.05861234664916992 diff --git a/results/combined/merges_timed/yegor256/rexsl.csv b/results/combined/merges_timed/yegor256/rexsl.csv index 7e0a366f7b..c266ea2da8 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,True,123,174,1505,2,True,123,Tests_passed,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,True,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,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_failed,ed636813ff8dc0381591bc5434fd4e1d16874f5d0b0394e6bec571aabad722f0,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,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_failed,3533cf7305e571c39dffab6692ef3fc51dc591a524974ed5053dc95cbd527ffb,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,0.04503488540649414,0.04123234748840332,0.061663150787353516,0.032897233963012695,0.07154345512390137,0.04764103889465332,0.051438093185424805,0.18664884567260742,0.11896014213562012,0.05459451675415039,0.8308706283569336,0.06490588188171387,0.08588504791259766,0.0658576488494873,0.09047508239746094,0.0885627269744873 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,True,123,174,1505,2,True,123,Tests_passed,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,True,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,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_failed,ed636813ff8dc0381591bc5434fd4e1d16874f5d0b0394e6bec571aabad722f0,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,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_failed,3533cf7305e571c39dffab6692ef3fc51dc591a524974ed5053dc95cbd527ffb,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,0.04503488540649414,0.04123234748840332,0.061663150787353516,0.032897233963012695,0.07154345512390137,0.04764103889465332,0.051438093185424805,0.18664884567260742,0.11896014213562012,0.05459451675415039,0.8308706283569336,0.06490588188171387,0.08588504791259766,0.0658576488494873,0.09047508239746094,0.0885627269744873,0.08558177947998047,0.08655261993408203,0.0913999080657959,0.09154295921325684,0.09102988243103027,0.08799386024475098,0.08752036094665527,0.13103747367858887,0.11992883682250977,0.10515761375427246,0.8293895721435547,0.08438467979431152,0.08461666107177734,0.08465981483459473,0.08449316024780273,0.08436751365661621 diff --git a/results/combined/merges_timed/yegor256/xembly.csv b/results/combined/merges_timed/yegor256/xembly.csv index 116e88f8b2..b462766220 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,True,69,264,2406,3,True,69,Tests_passed,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,True,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,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,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_failed,bbf190ea313245ff940976f3af5488ba074c2dbd788319e964b05832f062f5c1,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,0.06286096572875977,0.05670046806335449,0.060605525970458984,0.02741718292236328,0.07490921020507812,0.07285356521606445,0.05457878112792969,0.2848944664001465,0.1720104217529297,0.053894996643066406,0.5670633316040039,0.05124402046203613,0.09777355194091797,0.04982590675354004,0.09974288940429688,0.09943962097167969 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,True,69,264,2406,3,True,69,Tests_passed,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,True,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,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,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_failed,bbf190ea313245ff940976f3af5488ba074c2dbd788319e964b05832f062f5c1,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,0.06286096572875977,0.05670046806335449,0.060605525970458984,0.02741718292236328,0.07490921020507812,0.07285356521606445,0.05457878112792969,0.2848944664001465,0.1720104217529297,0.053894996643066406,0.5670633316040039,0.05124402046203613,0.09777355194091797,0.04982590675354004,0.09974288940429688,0.09943962097167969,0.09463667869567871,0.09802031517028809,0.09615564346313477,0.09779000282287598,0.09565472602844238,0.09833526611328125,0.09816169738769531,0.15511035919189453,0.15200066566467285,0.10814762115478516,0.5992045402526855,0.09450316429138184,0.09290790557861328,0.09431028366088867,0.09525394439697266,0.09528255462646484 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-commons.csv b/results/combined/merges_timed/yfpeng/pengyifan-commons.csv index 9fb1b238cb..8e9840cbc3 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,True,True,True,15,39,86,3,True,15,Tests_passed,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,True,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,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,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Merge_timedout,,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,8c0f42d98c8b641190f21fee2bd47333afb31c88727307909715088db72350ef,Merge_timedout,,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,0.047850608825683594,0.054338932037353516,0.04835200309753418,0.020472288131713867,0.0469362735748291,0.047505855560302734,0.05023479461669922,0.254378080368042,0.17200541496276855,1.9539625644683838,-1.0,0.0368499755859375,0.08412051200866699,0.03723788261413574,0.08694624900817871,0.08438372611999512 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,True,True,True,15,39,86,3,True,15,Tests_passed,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,True,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,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,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Merge_timedout,,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,8c0f42d98c8b641190f21fee2bd47333afb31c88727307909715088db72350ef,Merge_timedout,,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,Tests_passed,ae8d6ae990ca7c05cd8a98e09cc6dabe98d555d37a7f275e3d13d6a36a79fc9b,0.047850608825683594,0.054338932037353516,0.04835200309753418,0.020472288131713867,0.0469362735748291,0.047505855560302734,0.05023479461669922,0.254378080368042,0.17200541496276855,1.9539625644683838,-1.0,0.0368499755859375,0.08412051200866699,0.03723788261413574,0.08694624900817871,0.08438372611999512,0.08482551574707031,0.0854792594909668,0.0864872932434082,0.08983993530273438,0.08900690078735352,0.08699202537536621,0.08758401870727539,0.139054536819458,0.13971352577209473,2.2601356506347656,-1.0,0.08522963523864746,0.08376312255859375,0.08567047119140625,0.08575320243835449,0.08407449722290039 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv b/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv index a28b214854..0e5737d74f 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,True,True,Tests_passed,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,True,13,15,334,2,True,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,True,13,True,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,f4e97aae0be0b94aeaa440bc929d863e40d627c3b89dc4449bf29ebf88247f12,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Tests_failed,5fc08050b0aecaa0915a9369f0745dda6f451f9da36dffc1487af0b7b18fc25f,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,4d92146504b3e13bbea7aa714be0f8dbda62dd352aa626ebf937c649574976ce,Tests_failed,8798ee28591467e019d57861fa5b70400baabe8fef1f182d72a0124fe21ad7cc,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,0.042832136154174805,0.042839765548706055,0.03577995300292969,0.014175891876220703,0.039369821548461914,0.03593921661376953,0.04081106185913086,0.17174267768859863,0.11858630180358887,0.42534947395324707,0.24170494079589844,0.04027605056762695,0.04186129570007324,0.040335893630981445,0.05440473556518555,0.054497480392456055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,True,True,Tests_passed,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,True,13,15,334,2,True,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,True,13,True,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,f4e97aae0be0b94aeaa440bc929d863e40d627c3b89dc4449bf29ebf88247f12,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Tests_failed,5fc08050b0aecaa0915a9369f0745dda6f451f9da36dffc1487af0b7b18fc25f,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,4d92146504b3e13bbea7aa714be0f8dbda62dd352aa626ebf937c649574976ce,Tests_failed,8798ee28591467e019d57861fa5b70400baabe8fef1f182d72a0124fe21ad7cc,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,Tests_passed,cfaaa048652a29355ee3f3fa25b30c8a3f9d76ca862190f910f75bb694f221af,0.042832136154174805,0.042839765548706055,0.03577995300292969,0.014175891876220703,0.039369821548461914,0.03593921661376953,0.04081106185913086,0.17174267768859863,0.11858630180358887,0.42534947395324707,0.24170494079589844,0.04027605056762695,0.04186129570007324,0.040335893630981445,0.05440473556518555,0.054497480392456055,0.05333089828491211,0.05268263816833496,0.05211615562438965,0.05404353141784668,0.051842451095581055,0.05280256271362305,0.05347728729248047,0.08631420135498047,0.08825421333312988,0.4517953395843506,0.30297374725341797,0.055469512939453125,0.05395340919494629,0.05318331718444824,0.05372905731201172,0.05269193649291992 diff --git a/results/combined/merges_timed/yinlou/mltk.csv b/results/combined/merges_timed/yinlou/mltk.csv index 5477f746b7..0b6e48bed7 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,True,43,80,184,143,True,144,Tests_passed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,True,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,True,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,0.06792473793029785,0.0612025260925293,0.055242300033569336,0.02980828285217285,0.0596160888671875,0.03842973709106445,0.06410479545593262,2.7300796508789062,0.19652986526489258,1.1095428466796875,1.0381956100463867,0.052922964096069336,0.22887849807739258,0.053223371505737305,0.23305273056030273,0.23024225234985352 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,True,43,80,184,143,True,144,Tests_passed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,True,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,True,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,0.06792473793029785,0.0612025260925293,0.055242300033569336,0.02980828285217285,0.0596160888671875,0.03842973709106445,0.06410479545593262,2.7300796508789062,0.19652986526489258,1.1095428466796875,1.0381956100463867,0.052922964096069336,0.22887849807739258,0.053223371505737305,0.23305273056030273,0.23024225234985352,0.23113250732421875,0.2307748794555664,0.23357772827148438,0.23149752616882324,0.23368310928344727,0.23553824424743652,0.23575496673583984,0.9639716148376465,0.2963407039642334,1.4294471740722656,1.4043323993682861,0.22922825813293457,0.2276144027709961,0.2312300205230713,0.230147123336792,0.2292006015777588 diff --git a/results/combined/merges_timed/yinwang0/rubysonar.csv b/results/combined/merges_timed/yinwang0/rubysonar.csv index c22f959194..76fcb0dd3e 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,True,35,222,1323,4,True,35,Tests_passed,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,True,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,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,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,c31f0bd3cedb0d5b9a2f90ae64c9d45b08a3ab6ded78df172a6080dd614d7538,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,b0aa616a7f0b19cd3b27629d283e7fd04073771780f77fd3df8df9be12981489,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,0.040146589279174805,0.018051862716674805,0.015120983123779297,0.051954030990600586,0.02375006675720215,0.05970931053161621,0.04673409461975098,0.22001910209655762,0.17007827758789062,1.3007075786590576,1.0780589580535889,0.05705404281616211,0.12362408638000488,0.1103203296661377,0.07611274719238281,0.12209939956665039 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,True,35,222,1323,4,True,35,Tests_passed,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,True,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,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,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,c31f0bd3cedb0d5b9a2f90ae64c9d45b08a3ab6ded78df172a6080dd614d7538,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,b0aa616a7f0b19cd3b27629d283e7fd04073771780f77fd3df8df9be12981489,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,0.040146589279174805,0.018051862716674805,0.015120983123779297,0.051954030990600586,0.02375006675720215,0.05970931053161621,0.04673409461975098,0.22001910209655762,0.17007827758789062,1.3007075786590576,1.0780589580535889,0.05705404281616211,0.12362408638000488,0.1103203296661377,0.07611274719238281,0.12209939956665039,0.10901522636413574,0.12563729286193848,0.12628746032714844,0.07747316360473633,0.13385939598083496,0.13352298736572266,0.13158488273620605,0.14212965965270996,0.1933450698852539,1.6490213871002197,1.2425596714019775,0.12278962135314941,0.0805506706237793,0.1221930980682373,0.12463665008544922,0.07668256759643555 diff --git a/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv b/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv index 9c0b718ecb..e5c3e6502a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,True,8,10,233,5,True,10,Tests_passed,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,True,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,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_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,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_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,0.044097185134887695,0.0442967414855957,0.04829597473144531,0.016036033630371094,0.049395084381103516,0.04402923583984375,0.04138898849487305,0.2341747283935547,0.031717777252197266,0.04310917854309082,0.29298877716064453,0.03326296806335449,0.04549074172973633,0.03311944007873535,0.04516005516052246,0.04612445831298828 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,True,8,10,233,5,True,10,Tests_passed,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,True,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,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_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,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_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,0.044097185134887695,0.0442967414855957,0.04829597473144531,0.016036033630371094,0.049395084381103516,0.04402923583984375,0.04138898849487305,0.2341747283935547,0.031717777252197266,0.04310917854309082,0.29298877716064453,0.03326296806335449,0.04549074172973633,0.03311944007873535,0.04516005516052246,0.04612445831298828,0.04439663887023926,0.043186187744140625,0.0442047119140625,0.04367208480834961,0.04454445838928223,0.043882131576538086,0.04416155815124512,0.08598995208740234,0.050658226013183594,0.05707406997680664,0.31319117546081543,0.04337263107299805,0.04336738586425781,0.04407095909118652,0.04329848289489746,0.04422354698181152 diff --git a/results/combined/merges_timed/yubico/ykneo-openpgp.csv b/results/combined/merges_timed/yubico/ykneo-openpgp.csv index aed23db2ac..a3777379a2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,True,False,True,5,25,236,3,True,5,Tests_passed,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,True,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,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,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,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,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,3ca661085665682fc2c850261bb62c9841771525bff36e52951ae8700680a286,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,0.04641914367675781,0.049211978912353516,0.043523311614990234,0.017046689987182617,0.049997568130493164,0.049814462661743164,0.04286551475524902,0.23771262168884277,0.168565034866333,2.5300581455230713,0.4976954460144043,0.03312063217163086,0.08089971542358398,0.031307220458984375,0.08007407188415527,0.08190560340881348 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,True,False,True,5,25,236,3,True,5,Tests_passed,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,True,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,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,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,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,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,3ca661085665682fc2c850261bb62c9841771525bff36e52951ae8700680a286,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,0.04641914367675781,0.049211978912353516,0.043523311614990234,0.017046689987182617,0.049997568130493164,0.049814462661743164,0.04286551475524902,0.23771262168884277,0.168565034866333,2.5300581455230713,0.4976954460144043,0.03312063217163086,0.08089971542358398,0.031307220458984375,0.08007407188415527,0.08190560340881348,0.07691621780395508,0.07855439186096191,0.07658505439758301,0.07867741584777832,0.07769131660461426,0.08005094528198242,0.07796859741210938,0.12604689598083496,0.13260746002197266,2.5114846229553223,0.5090534687042236,0.07855629920959473,0.07809042930603027,0.07665729522705078,0.0779409408569336,0.08067965507507324 diff --git a/results/combined/merges_timed/zalando/java-sproc-wrapper.csv b/results/combined/merges_timed/zalando/java-sproc-wrapper.csv index ed738bbb58..7abe46b503 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,True,27,60,254,2,True,27,Tests_passed,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,True,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,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,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,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,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,06c8b6014343fce0744617b97afa175eb464f909caeb2a460c8a3d437938de94,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,0.05435514450073242,0.03977394104003906,0.0476071834564209,0.03176236152648926,0.05068850517272949,0.045848846435546875,0.06190967559814453,0.1990358829498291,0.11773347854614258,1.7386884689331055,0.6276290416717529,0.039907217025756836,0.06789946556091309,0.03928804397583008,0.06971001625061035,0.07856202125549316 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,True,27,60,254,2,True,27,Tests_passed,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,True,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,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,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,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,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,06c8b6014343fce0744617b97afa175eb464f909caeb2a460c8a3d437938de94,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,0.05435514450073242,0.03977394104003906,0.0476071834564209,0.03176236152648926,0.05068850517272949,0.045848846435546875,0.06190967559814453,0.1990358829498291,0.11773347854614258,1.7386884689331055,0.6276290416717529,0.039907217025756836,0.06789946556091309,0.03928804397583008,0.06971001625061035,0.07856202125549316,0.06624770164489746,0.06755948066711426,0.0660562515258789,0.06758356094360352,0.08098292350769043,0.08236289024353027,0.06593823432922363,0.09988236427307129,0.09838366508483887,1.7070186138153076,0.6960411071777344,0.07592391967773438,0.06499099731445312,0.06680035591125488,0.06607556343078613,0.06946253776550293 diff --git a/results/combined/merges_timed/zauberlabs/gnip4j.csv b/results/combined/merges_timed/zauberlabs/gnip4j.csv index ffb5c0bc3a..3829f7308b 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,Tests_passed,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,True,9,19,123.0,2,True,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,True,9,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,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,b500307c3bffa0b4103349c8ab6a858478afcaee5a43da37abf2075ead134bd9,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,0.027280092239379883,0.04873514175415039,0.025678157806396484,0.015756607055664062,0.03682374954223633,0.04065847396850586,0.03618979454040527,0.16874933242797852,0.11606073379516602,0.6379499435424805,0.515207052230835,0.06410074234008789,0.05819201469421387,0.04361414909362793,0.06199502944946289,0.04525136947631836 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,Tests_passed,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,True,9,19,123.0,2,True,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,True,9,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,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,b500307c3bffa0b4103349c8ab6a858478afcaee5a43da37abf2075ead134bd9,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,0.027280092239379883,0.04873514175415039,0.025678157806396484,0.015756607055664062,0.03682374954223633,0.04065847396850586,0.03618979454040527,0.16874933242797852,0.11606073379516602,0.6379499435424805,0.515207052230835,0.06410074234008789,0.05819201469421387,0.04361414909362793,0.06199502944946289,0.04525136947631836,0.04236578941345215,0.06699919700622559,0.04393792152404785,0.0445098876953125,0.0680537223815918,0.04338860511779785,0.06569027900695801,0.0972907543182373,0.08117175102233887,0.6532912254333496,0.5715963840484619,0.04437732696533203,0.044146060943603516,0.06341958045959473,0.04465031623840332,0.06670427322387695 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 a308e2814c..54b83ebbde 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,Tests_passed,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,True,5,13,77,2,True,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,True,5,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,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,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,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b91a5c40cd68a4fa1027a74b4374f68f837f05a02c356e2c89ffc8f0a2257aa1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,0.03885316848754883,0.03927254676818848,0.042862653732299805,0.013746500015258789,0.035462379455566406,0.043630361557006836,0.04184293746948242,0.16144967079162598,0.10970926284790039,0.8189198970794678,0.33669042587280273,0.02913212776184082,0.05246472358703613,0.029300689697265625,0.05212998390197754,0.05331611633300781 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,Tests_passed,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,True,5,13,77,2,True,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,True,5,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,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,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,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b91a5c40cd68a4fa1027a74b4374f68f837f05a02c356e2c89ffc8f0a2257aa1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,0.03885316848754883,0.03927254676818848,0.042862653732299805,0.013746500015258789,0.035462379455566406,0.043630361557006836,0.04184293746948242,0.16144967079162598,0.10970926284790039,0.8189198970794678,0.33669042587280273,0.02913212776184082,0.05246472358703613,0.029300689697265625,0.05212998390197754,0.05331611633300781,0.05323672294616699,0.05466341972351074,0.05322432518005371,0.05305981636047363,0.05327320098876953,0.05425667762756348,0.05376625061035156,0.08463788032531738,0.08475089073181152,0.9156002998352051,0.3826429843902588,0.05404353141784668,0.05375361442565918,0.05347013473510742,0.05323004722595215,0.053658485412597656 diff --git a/results/combined/merges_timed/zeromq/jeromq.csv b/results/combined/merges_timed/zeromq/jeromq.csv index f894d76b51..3e26ae6a31 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,True,6,17,50,2,True,6,Tests_passed,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,True,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,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_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,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_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,c3d43716b491133b227b52f7be88dc8522217d4d4899915e779586e3f9a25d42,Tests_failed,d32438f4767f0dda5014088bda8a28021d276c3295301221b5f6d04073317634,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,0.03474736213684082,0.03959298133850098,0.03258943557739258,0.03499150276184082,0.04834628105163574,0.04756927490234375,0.02677011489868164,0.15631365776062012,0.1132655143737793,1.3718414306640625,0.5107340812683105,0.055748701095581055,0.08762335777282715,0.05269598960876465,0.06744503974914551,0.08171796798706055 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,True,6,17,50,2,True,6,Tests_passed,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,True,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,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_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,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_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,c3d43716b491133b227b52f7be88dc8522217d4d4899915e779586e3f9a25d42,Tests_failed,d32438f4767f0dda5014088bda8a28021d276c3295301221b5f6d04073317634,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,0.03474736213684082,0.03959298133850098,0.03258943557739258,0.03499150276184082,0.04834628105163574,0.04756927490234375,0.02677011489868164,0.15631365776062012,0.1132655143737793,1.3718414306640625,0.5107340812683105,0.055748701095581055,0.08762335777282715,0.05269598960876465,0.06744503974914551,0.08171796798706055,0.07564377784729004,0.06534504890441895,0.08570075035095215,0.06186938285827637,0.08744549751281738,0.08091092109680176,0.09110045433044434,0.11910390853881836,0.11337852478027344,1.2982559204101562,0.5447299480438232,0.08176946640014648,0.0798041820526123,0.06183171272277832,0.08443832397460938,0.06487679481506348 diff --git a/results/combined/merges_timed/zeroturnaround/zt-zip.csv b/results/combined/merges_timed/zeroturnaround/zt-zip.csv index c25c13db56..d379ab85e7 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,Tests_passed,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,True,27,92,1149,2,True,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,True,27,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,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,15443623b80564448e2d0b615c7a391a6600aeb713b05efcadf80806466da2e2,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,92b30a350ba58ea29aa72f6b97117a340147fbf25256197ca0c9cae187bfe353,Tests_failed,7edb17a875a133b3cb7ec777c8bd606567a9661bb3c903cef64e8c9fe1783465,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,0.04478907585144043,0.02575230598449707,0.03756284713745117,0.021027326583862305,0.044118404388427734,0.03557085990905762,0.036002397537231445,0.11208534240722656,0.10580778121948242,2.287614345550537,0.7946357727050781,0.0520479679107666,0.052521705627441406,0.05625796318054199,0.05716657638549805,0.055928707122802734 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,Tests_passed,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,True,27,92,1149,2,True,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,True,27,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,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,15443623b80564448e2d0b615c7a391a6600aeb713b05efcadf80806466da2e2,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,92b30a350ba58ea29aa72f6b97117a340147fbf25256197ca0c9cae187bfe353,Tests_failed,7edb17a875a133b3cb7ec777c8bd606567a9661bb3c903cef64e8c9fe1783465,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,0.04478907585144043,0.02575230598449707,0.03756284713745117,0.021027326583862305,0.044118404388427734,0.03557085990905762,0.036002397537231445,0.11208534240722656,0.10580778121948242,2.287614345550537,0.7946357727050781,0.0520479679107666,0.052521705627441406,0.05625796318054199,0.05716657638549805,0.055928707122802734,0.05223512649536133,0.051074981689453125,0.056912899017333984,0.057143211364746094,0.057001352310180664,0.055550336837768555,0.05429887771606445,0.0899651050567627,0.10003662109375,2.1635544300079346,0.8727397918701172,0.05577230453491211,0.05405139923095703,0.055155038833618164,0.0569460391998291,0.05302238464355469 diff --git a/results/combined/merges_timed/zextras/openzal.csv b/results/combined/merges_timed/zextras/openzal.csv index ce751d5178..2ecf30f8d5 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,True,5,6,71,3,True,5,Tests_passed,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,956f282fe6889b8a5094fa580c771b54fa9da4d08510b9f744ae4c8bb47da7e4,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,b91e662f6b547c97e392712289c740e1cd68a3b03d593bf8a74a9285e2752978,Merge_failed,faf8a50d08ebca5796e46327f34a21bf40a1d38423a783c99ab9226f1c850038,Tests_passed,6ffc1a8da5990234de890a4950b7c4eb5fc6c37425263f3641461e0dd4d4ecd8,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,0.010894536972045898,0.02673649787902832,0.031289100646972656,0.018476247787475586,0.030719995498657227,0.031239748001098633,0.030586719512939453,0.07842278480529785,0.12412667274475098,1.292450189590454,0.6608855724334717,0.05657052993774414,0.06021571159362793,0.06130027770996094,0.06981921195983887,0.07059454917907715 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,True,5,6,71,3,True,5,Tests_passed,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,956f282fe6889b8a5094fa580c771b54fa9da4d08510b9f744ae4c8bb47da7e4,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,b91e662f6b547c97e392712289c740e1cd68a3b03d593bf8a74a9285e2752978,Merge_failed,faf8a50d08ebca5796e46327f34a21bf40a1d38423a783c99ab9226f1c850038,Tests_passed,6ffc1a8da5990234de890a4950b7c4eb5fc6c37425263f3641461e0dd4d4ecd8,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,Merge_failed,540b88f30eb55d6860d175d2a37faee1c6de0d3755e8f673e604708ea6dd1bc2,0.010894536972045898,0.02673649787902832,0.031289100646972656,0.018476247787475586,0.030719995498657227,0.031239748001098633,0.030586719512939453,0.07842278480529785,0.12412667274475098,1.292450189590454,0.6608855724334717,0.05657052993774414,0.06021571159362793,0.06130027770996094,0.06981921195983887,0.07059454917907715,0.06596899032592773,0.0685737133026123,0.06449770927429199,0.06599283218383789,0.06421232223510742,0.06649899482727051,0.0662226676940918,0.11264872550964355,0.12825393676757812,1.432060956954956,0.7817952632904053,0.06453895568847656,0.06894183158874512,0.06486105918884277,0.06552338600158691,0.06537485122680664 diff --git a/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv b/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv index c65f803214..3007252e1a 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,True,6,9,58,2,True,6,Tests_passed,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,True,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,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,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,01654ba30e77e6fb5c199ad07aa89bd40260933087b935541c721bcd76997609,Tests_failed,d13ed0b0533f066caf471c682fe9d372e06bb9e3d16b3bdcebae9c5fe960e8c6,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,0.03664398193359375,0.0241854190826416,0.04019880294799805,0.02057027816772461,0.025133848190307617,0.04468703269958496,0.03863668441772461,0.1674509048461914,0.09549236297607422,0.7118239402770996,0.44086766242980957,0.039335012435913086,0.06483292579650879,0.03996896743774414,0.06445026397705078,0.0652151107788086 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,True,6,9,58,2,True,6,Tests_passed,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,True,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,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,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,01654ba30e77e6fb5c199ad07aa89bd40260933087b935541c721bcd76997609,Tests_failed,d13ed0b0533f066caf471c682fe9d372e06bb9e3d16b3bdcebae9c5fe960e8c6,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,Tests_passed,77ace94a62ad22a8b9a7973a8bb72c6c823eb7d12dd3a63d1ee84aacd362a18c,0.03664398193359375,0.0241854190826416,0.04019880294799805,0.02057027816772461,0.025133848190307617,0.04468703269958496,0.03863668441772461,0.1674509048461914,0.09549236297607422,0.7118239402770996,0.44086766242980957,0.039335012435913086,0.06483292579650879,0.03996896743774414,0.06445026397705078,0.0652151107788086,0.0641932487487793,0.06425833702087402,0.06838297843933105,0.06256818771362305,0.06893372535705566,0.07002401351928711,0.06616377830505371,0.1026296615600586,0.09750056266784668,0.7753438949584961,0.492246150970459,0.06495332717895508,0.06473088264465332,0.06622028350830078,0.0632317066192627,0.06547927856445312 diff --git a/results/combined/merges_timed/zhongdj/lifecycle.csv b/results/combined/merges_timed/zhongdj/lifecycle.csv index d473180910..05f3bcd5fc 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,True,42,214,2511,5,True,42,Tests_passed,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,True,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,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,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,7a5567ffa70de4da7944a49cc13817f7520f75a8c254ce8ffffdef0d0e693e25,Merge_failed,3ebb649a47ca0c276d951bf5365cea79c65ae9ba3dae53fcdeb053bf73b625a7,Merge_failed,d3fa7a99047001c2ad4947e3b78f70cbb51fcc0e9a8fd633c69e04b410628c95,Merge_timedout,,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,0.0444948673248291,0.05820894241333008,0.04722762107849121,0.025925636291503906,0.06663656234741211,0.05589008331298828,0.053575992584228516,0.32775259017944336,0.2905256748199463,4.437683582305908,-1.0,0.06305170059204102,0.12210440635681152,0.06446504592895508,0.11733412742614746,0.11876964569091797 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,True,42,214,2511,5,True,42,Tests_passed,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,True,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,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,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,7a5567ffa70de4da7944a49cc13817f7520f75a8c254ce8ffffdef0d0e693e25,Merge_failed,3ebb649a47ca0c276d951bf5365cea79c65ae9ba3dae53fcdeb053bf73b625a7,Merge_failed,d3fa7a99047001c2ad4947e3b78f70cbb51fcc0e9a8fd633c69e04b410628c95,Merge_timedout,,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,e6e5feddeab78fafc5dae9d8107e8fdacb65f39b1ca3f4c221b09c0e8bc09a9e,Merge_failed,f27c73f5e3372d47e3efaf55acc782f4ad22671614b442089ca0b3d0ee7e39ca,0.0444948673248291,0.05820894241333008,0.04722762107849121,0.025925636291503906,0.06663656234741211,0.05589008331298828,0.053575992584228516,0.32775259017944336,0.2905256748199463,4.437683582305908,-1.0,0.06305170059204102,0.12210440635681152,0.06446504592895508,0.11733412742614746,0.11876964569091797,0.11757421493530273,0.11863303184509277,0.1235504150390625,0.12290668487548828,0.12209129333496094,0.12000703811645508,0.11948704719543457,0.20716428756713867,0.23889708518981934,4.9988133907318115,-1.0,0.11926698684692383,0.11931753158569336,0.12078523635864258,0.11899709701538086,0.11854767799377441 diff --git a/results/combined/merges_timed/zhuowei/raspberryjuice.csv b/results/combined/merges_timed/zhuowei/raspberryjuice.csv index 154bba4a0c..fb70d340f2 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,True,16,66,1251,3,True,16,Tests_passed,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,True,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,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,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,262f370646a796d3b4815787be806ee45ff970e87eca04d2f58595d2901b0b9b,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,0.0156857967376709,0.0165255069732666,0.018988847732543945,0.027880191802978516,0.019244670867919922,0.018935680389404297,0.019138097763061523,0.0601348876953125,0.12426924705505371,1.60455322265625,0.3654050827026367,0.04742097854614258,0.09778213500976562,0.04918718338012695,0.09944581985473633,0.09294557571411133 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,True,16,66,1251,3,True,16,Tests_passed,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,True,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,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,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,262f370646a796d3b4815787be806ee45ff970e87eca04d2f58595d2901b0b9b,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,50e2bf828dd95fcd660994340c181bf44d00db0c7f3fdbf6b30bbd742928e20f,Tests_passed,6f12553c94ce5678e798411562614b98ebd032eb491fa54400df60567c0f81d4,0.0156857967376709,0.0165255069732666,0.018988847732543945,0.027880191802978516,0.019244670867919922,0.018935680389404297,0.019138097763061523,0.0601348876953125,0.12426924705505371,1.60455322265625,0.3654050827026367,0.04742097854614258,0.09778213500976562,0.04918718338012695,0.09944581985473633,0.09294557571411133,0.0784296989440918,0.09446859359741211,0.07831692695617676,0.09661984443664551,0.07995820045471191,0.10073661804199219,0.07807207107543945,0.15109729766845703,0.14858269691467285,1.7722153663635254,0.4020845890045166,0.0952749252319336,0.09290170669555664,0.09474039077758789,0.08411240577697754,0.09845399856567383 diff --git a/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv b/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv index b662abae2e..9bda796132 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,True,True,True,36,12,322,3,True,36,Tests_passed,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,True,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,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,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,fa038e7e0849a1b7ac90b86a7db616e7898fdba0d123d4889b9bdd725434f22e,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,40c33dbfbe9fbce805321c61e8bec332dfca11e93df7918070cef52ed7330664,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,0.03672480583190918,0.04035663604736328,0.03165769577026367,0.013305187225341797,0.039823293685913086,0.03998255729675293,0.041176795959472656,0.23372650146484375,0.11052107810974121,0.45059752464294434,0.3515908718109131,0.034233808517456055,0.05640411376953125,0.03455162048339844,0.053719282150268555,0.05522489547729492 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,True,True,True,36,12,322,3,True,36,Tests_passed,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,True,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,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,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,fa038e7e0849a1b7ac90b86a7db616e7898fdba0d123d4889b9bdd725434f22e,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,40c33dbfbe9fbce805321c61e8bec332dfca11e93df7918070cef52ed7330664,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,Merge_failed,300c82f1ce05def0ac20b84e5f6e129b220c376ec1fb33fbdfdfbb35f430f444,0.03672480583190918,0.04035663604736328,0.03165769577026367,0.013305187225341797,0.039823293685913086,0.03998255729675293,0.041176795959472656,0.23372650146484375,0.11052107810974121,0.45059752464294434,0.3515908718109131,0.034233808517456055,0.05640411376953125,0.03455162048339844,0.053719282150268555,0.05522489547729492,0.052823543548583984,0.05140852928161621,0.05330657958984375,0.05233192443847656,0.05299782752990723,0.05283498764038086,0.05199122428894043,0.10184907913208008,0.08328866958618164,0.48423194885253906,0.40461111068725586,0.05305290222167969,0.053574562072753906,0.05324292182922363,0.052872657775878906,0.05278444290161133 diff --git a/results/combined/merges_timed/zxing/zxing.csv b/results/combined/merges_timed/zxing/zxing.csv index 2615a25262..04b9eae030 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time -89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,71230b3e80c8894744633e33a7554b410487de2708ffd0b80f5a8f438d2a46f5,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.05356431007385254,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.21402740478515625,0.07382321357727051,1.876878023147583,0.10169148445129395,0.129744291305542,0.07479286193847656,0.16515636444091797,0.17100095748901367 +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time +89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,71230b3e80c8894744633e33a7554b410487de2708ffd0b80f5a8f438d2a46f5,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,df9881977f25669d37596909c5d62479fe37effacbe148f27bae22f1ef14eafd,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.05356431007385254,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.21402740478515625,0.07382321357727051,1.876878023147583,0.10169148445129395,0.129744291305542,0.07479286193847656,0.16515636444091797,0.17100095748901367,0.15008997917175293,0.15752768516540527,0.1540389060974121,0.1625206470489502,0.15768694877624512,0.15484023094177246,0.155137300491333,0.2375326156616211,0.24461078643798828,0.17275190353393555,2.0463273525238037,0.15117526054382324,0.14869284629821777,0.14409494400024414,0.15017080307006836,0.15329766273498535 diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index b700708e13e0d3f65640aaad94013644d003f79a..7ad163cad664dacb26f7a0050aecf6a97d3eb736 100644 GIT binary patch delta 106 zcmZ3qlxfjYrVVep*v$=%Oo3?f=dLR-_U3cl4_KWo9UYwv9bHTeOb)%)r&z)zZz< b$<4sY#nH&g(b&z@$xgwBkdnzCCvF4)7+@d| diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index feba40cfc8d5290c825a0d677cbb1be5bfbcbd70..5606224b045ca4d1dcfd8938daf645e27f927578 100644 GIT binary patch delta 106 zcmX@HjOoNOrVW$2+06}&Oo3?f%3PiR?BZf*=44@RYG~$YX5i}VYUyU_ b9Rl diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 1d68cda12cd79db7e64b1b4e458820a28adfd4e4..4a767b3aea3edbe50f663588a970fb690f639cde 100644 GIT binary patch delta 106 zcmdmegL(H2<_%Mxu$vninHn0IOrHJZ3XHwE?CB|1XA4skLl-j(a~DG=S0gt!7dJC! bR|7{2LkkNtM;B8=b2|kaLP{n#zuo}=O>H1X delta 106 zcmdmegL(H2<_%Mxu$vef7#JBDO`iSa3XHwE?CB|1XHyerM`trjVgY1|}A67LLxwP9|;! a#>OUYP8KHSMy9Tob_zCxluWK~-2ecEHXVcj delta 106 zcmZ4A!?eDKX+v`zyNRKJfsv8L=h89MK&KAyYb_zCxluWK~-2ec6bsc5^ diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index 58436deabc4ba2d2781c654fa061d314d39be310..f9bebb9acb710d0eefd17711c3d35c92d035d646 100644 GIT binary patch delta 106 zcmccF$#k=mX@g!ZySbr}siCpKWYgL!F!pAFx+|>CPHq-PrY>gY1|}A67LLxwP9|;! a#>OUYP8KHSMy9Tob_zCxluTA{*#rPe)*N;K delta 106 zcmccF$#k=mX@g!ZyNRKJfsv8LWYgL!F!pAFx+|>CMlQ}qMlNQKP6p=h89MK&KAyYb_zCxluTA{*#rPX6&zRq diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index 32aa446a184fdfbdf54a8dc71852ce5b2c908f8c..da1d6811e96b47acdd6a4e727ab4ff8da674e149 100644 GIT binary patch delta 106 zcmew{mFdS+rVSa*?B<3>riR7_lk=Oez}TC;S~jsdJGogHnYx&n8<<$QSvWcyJDIo{ a7#o|oIa!#P8=1OV+9}u&QZm`TYbOAv4jqpG delta 106 zcmew{mFdS+rVSa*>?Vc=21Z8alk=Oez}TC;S~jsdJG&XWSU5YHxVoB}8<;veyBL@l aJ2_fd8W=lUn3)(j*(ul%QZm`TYbOA%j~%xF diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index e17a60af277531c5b7cbb8e762abbe8c54a37750..b95fd4b7d35364f3171e9bd43905e3c28b45dc95 100644 GIT binary patch delta 106 zcmeC3!PGm0X+um4ySbr}siCpy#0X=#gbpQYW diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index a24c099a902d1359343755a49541d5f04fad6717..e56adbf8516129c08d3675910e90cea3483bba2d 100644 GIT binary patch delta 105 zcmX>*o$2g!rVVl}?B<3>riR9*lT}-;z}TBwZ?HPMnK@cI8@iagIl37dm^d05I~o|8 ZyP3OLTDZ9xnHU(@DcBHFGFiHN697ZZ9De`+ delta 105 zcmX>*o$2g!rVVl}>?Vc=21dq4lT}-;z}TBwZ?HNWnHU%vm^+#pI2yPanYdUunwq@3&C+ b&BV~f$&`!aIkdn#Tb9Mm$j^7`p2r&Qv delta 22 dcmez0$@IUIX@hG$yNQ8?p^>TOW}o`atN>`o2r~cx diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 00b69ecbd4e5eafb0988378d1855c4e4add97307..7b29437ec7d78822effa57ddc0798240da563ebf 100644 GIT binary patch delta 104 zcmX@NnCaYNrVY|vZ03eWrY6Rd6}zrNnVbJ~-D7ojHZyWHGH@|V1||lR6}zrNnVbJ~-D7ojaWgY;GIDivF?Vz`arY6P~ldHS0z}TC^dLFYn8=ANpTbj8z8abI78kk!cxtSOl a8arA#TN=9>xi~r+*(ul%QZl(_(q;gbejTd- delta 106 zcmZ3#jA{KcrVS?Vc=1||lUldHS0z}TC^dLFYnySSMdI2pM*x|ln<8M#DXOlE$01;*Zd@8xM$XA@I1Lqk(%Q$t51OH*efV@ES{ bLvvGSLrYUbBV$)rV><;KLP{pTd4B)^H}D_* diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index 46e04474bb10f37906cf33a10a490c79847f5770..d083ddbf24da7cd9d48c5f6cd784ce60683528e5 100644 GIT binary patch delta 104 zcmccJ!*sicX~Wt&HgiKGQxlWPo9nJZnVb9SZ?HOBS~?n-8af*}nwVOe7`i!`8XB0I Z8#_B28o3y|nYtO;DcBHFGI?d|CIFY79oPT> delta 104 zcmccJ!*sicX~Wt&HWNbw0~5o^o9nJZnVb9SZ?HPMx;i_Xx*C`}xtbdqn;AJ8m^hl7 ZIhr|J7+IJaSr}W`DcBHFGI?d|CIF!l9sB?Q diff --git a/results/greatest_hits/plots/git/cost_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf index e6c5e925b081c944bd10fa8cb1f5d8d893ddf2e0..72816def67c41f402606a1893fd5bb9fb09493d5 100644 GIT binary patch delta 104 zcmccH$#l1qX@hYso4KKpsfo#C%i60@=4O$)tE|qJmW~FdhR#NgCZ?7qhHg%#h6bkQ Z#?H=$MlQx~rf!CI3O0n4Ox9`H2mlwB8{+@~ delta 104 zcmccH$#l1qX@hYsn~9-;fr;T{%i60@=4O$)tE|qhuFlS;t_J2#uI7fuW=4(%CXVK2 Zj%LmlMi!<<7RDBK3O0n4Ox9`H2mm1p90vdZ diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index 64a4b0bd1636441939b79812e9919794d70df227..6142bc10cadb6e9536dcdd679d411a5f44a05690 100644 GIT binary patch delta 104 zcmZpi!PGc|X+wDno4KKpsfqFA+Lo(O=H`gjb*#?LW=5_?1}>&fCXS{?jwV2kv7?!* YtDCEfnX9>@v5B364Iw3yJ-c@R05Iqr$^ZZW delta 104 zcmZpi!PGc|X+wDnn~9-;fr-K7+Lo(O=H`gjb*#=VZe|8fMy`%7=8kSgE*6$%E@qA{ Z&X&fG=8lGrCZ>*d3O0n4O!n;F0RTCv9RL6T diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index aaba74b0c63045085cfc64f56d82c3f71787e33b..06ef7ef119c0984ccdc6de737239e3fd2cd37633 100644 GIT binary patch delta 104 zcmdlngK5VMrVZUKZ03eWrY0tnC$?OLGB@Y6-eh$)H8XKCb2K$_G&VJJb#pZ`bhR`y ZHg+?%bToH!G;?&ZQ?MbVWO7IM1^{`I9lihn delta 104 zcmdlngK5VMrVZUKY$k>V1}27+C$?OLGB@Y6-eh%lHZ?Laa5HgsG_^E!b+xp#Ff}zW ZF*0# diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index b98e6b87a4bca31e27c9b063a039e6846a892a0f..f76b5a539bb1f9940b0fc84690da583ef128a789 100644 GIT binary patch delta 104 zcmdl#ooWAcrVacpZ03eWrY0tnMO&^ynVUbf++=k&H8XKCb2K$_G&VJJb#pZ`bhR`y ZHg+?%bToH!G;?&ZQ?MbVWHL|pW&ldI9NYi^ delta 104 zcmdl#ooWAcrVacpY$k>V1}27+MO&^ynVUbf++=ljHZ?Laa5HgsG_^E!b+xp#Ff}zW ZF*0#mX?kNriRW&jwYs-CWdZKriKQl a=Ely>hDI*NZl-RAb_zCxluVvAZw~;~D;|&l delta 104 zcmcb%kLlVzrVU%BvzZtg7?>DN-ZlLyl(~88j6uCC6`rmhC&POj#L#%4y21}2W? aW{zgg7Dg7PMi#~vb_zCxluVvAZw~<8pB}UT diff --git a/results/reaper/merges_analyzer_histograms.pdf b/results/reaper/merges_analyzer_histograms.pdf index 367d015a95a4f5852c3bf38b9e15fb7c2d96a5c1..151c4083d5cf1dd64b20ec991e33a7b35cf83814 100644 GIT binary patch delta 29 lcmcb0j_1}no`x327N#xC^A*|64UJ4qO)a-CQ)J%43IMKQ3LXFe delta 29 lcmcb0j_1}no`x327N#xC^A*`m3@i*SOboX#Q)J%43IMJn3KjqW diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index 0a9a018e614ce4917f78b1b1782be005066ac774..d3ab9fb5946efa67fdea3701bf464377d0300264 100644 GIT binary patch delta 105 zcmZ3rlxfvcrVXFF*v$=%OwA2VCjaWX0%LE!+Wmml$-vmcz|qLm#nsHj(8Scp(!|uj b+}zR3+1b_5(9P1((oVsKfRf4ICvFA+>p~wU delta 105 zcmZ3rlxfvcrVXFF*i8%#3`|T6CjaWX0%aR+zS{kO)yd4z#N5@?(b>ts!qCy&#Ld#s c$jQXT#LUvn(8AQjz|u~^hJcdE-zRPc0O$7}`v3p{ diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index 8b6680b9b19cee8a91e46fa94e3226d672eaa4fb..7817f822bb1e4249bbe3176a64f5393d760dbb09 100644 GIT binary patch delta 106 zcmcb%jOp4krVaDD+06}&OwA2VCNJ&20%LD(=y}ZQY+!6*;Amv(;%a7MXkuz)X<}+% bZtiI2?Cff2=w|6?X{TUANXg`7lQsYV*Hs>F delta 106 zcmcb%jOp4krVaDD*-Z=$3`|T6CNJ&20%LD(=y}ZQY-Z`~>f~f(?B?uhXkuaHW^CeQ bXld^3X6|fY>1JkZZl_>FNXg`7lQsYV?Uf$# diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index 2a3087c9ef4941854cbbf26403e054e4f0e4db3f..7fff78444113c7b7f8e41deff3850827b90cf57c 100644 GIT binary patch delta 105 zcmX?joB7~v<_%)c*v$=%OwA3AC(Ay&0%LFf@$3|XqlL4R bg|Uf=sj;)6qpO*Loq~-c0VR`J-tGke{`nsR delta 105 zcmX?joB7~v<_%)c*i8%#3`~qIC(Ay&0%LFf@$3|gU| a<}Q|o#^#2WE`}z~b_zCxluWK^-3S1W2pzcq delta 106 zcmZ46!?d=CX+uLDyNRKJfr*LHCj%KcAW@e5?u1;pIZUz?Sj>gU| a<}Q|o#^#2WE`}z~b_zCxluWj0*#rQ1@*N-m delta 106 zcmaFW$@Hp|X@h+&yNRKJfr*LXWVhNYF!pA}x+|>CW`-u_uBML8P6if+j^-wAmWD=7 aCN3ssmS%<)rX~iKb_zCxluWj0*#rPrj~rqE diff --git a/results/reaper/plots/git/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf index caa21957152ab0ae3cb5fa24ee1e54cf1aba7d52..0f91a68676247bce8af5f2bab09701343f420f8c 100644 GIT binary patch delta 106 zcmeBLz|^&XX+voTySbr}skx!)gU| a<}Q|o#^#2WE`}z~b_zCxluQoj-vt17iydA7 delta 106 zcmeBLz|^&XX+voTyNRKJfr*LX)>w diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index 9d060bb90d3412caaf67bca9c369ca0b50b3c976..d19883ec36fed61109ab996c9fb202cf4c940ccc 100644 GIT binary patch delta 105 zcmbO-gK5ePrVS}A?B<3>rsjs`le1f{z}TDJT5qyCxj7pcn;5vdnp!v+xVe~_n>ra= aSelqxnwvWt8W=bm*(ul%P%=5Odout?Vc=1|}xPle1f{z}TDJT5qyCSr{0Zni(2cT9`Q-8koBpyP2Dr axfoa)nVUGeI++<6*(ul%P%=5OdoutglpH$% diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index bf2aded00df43cc73155d42207fbb1d9266221c0..6050f8a783e7662bf9f7b8b8f9d9835edda3251c 100644 GIT binary patch delta 106 zcmX>-o$2&+rVTPJ?B<3>rsjrbla*Vpz}TDrwcKEJb}=<@b}}_JcC|2cHZU-o$2&+rVTPJ>?Vc=1|}v(la*Vpz}TDrwcKEJHn%h~GH`ZrH8ylHcd;;aH8Hd_ av~YBEwRAOgG&6H^v{SGlq-3&W_a*>~P91*$ diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index ad5323899f8df9591a6166d01911441b047ce129..a6574076ff538ed8cb3b18c6889bd8542d531e4e 100644 GIT binary patch delta 106 zcmcbylj+7zrVXZ3+06}&OwA3=CfiKC0%LC$pLUSd*~Qer*~!$@*ww<&*}%la+|